Fix a merge case with files added in both heads but different
[stgit] / Makefile
2006-05-08 Pavel RoskinAdd a simple makefile