summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
Commit message (Expand)AuthorAgeFilesLines
* Document git-merge-fileJohannes Schindelin2006-12-161-0/+92