Merge branch 'master' of .
[gitweb.git] / Documentation / git-merge-index.txt
2005-09-08 Big tool rename.