Fix a bug in gitmergeonefile.py introduced recently
[stgit] / Makefile
2006-05-08 Pavel RoskinAdd a simple makefile