[PATCH] Finish documenting trivial merge rules
[gitweb.git] / git-merge-one-file.sh
2005-09-08 Big tool rename.