summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
AgeCommit message (Expand)Author
2007-01-18Documentation: sync git.txt command list and manual page titleJunio C Hamano
2006-12-17Fix mis-mark-up in git-merge-file.txt documentationJunio C Hamano
2006-12-16Document git-merge-fileJohannes Schindelin