Clean up the Makefile a bit.
[git.git] / git-merge-one-file-script
2005-04-18 Linus TorvaldsAdd the simple scripts I used to do a merge with conten...