[PATCH] Fix assertion failure when merging common ancestors.
[git.git] / git-merge-one-file.sh
2005-09-08 Junio C HamanoBig tool rename.