summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
AgeCommit message (Expand)AuthorFilesLines
2006-12-17Fix mis-mark-up in git-merge-file.txt documentationLibravatar Junio C Hamano1-2/+2
2006-12-16Document git-merge-fileLibravatar Johannes Schindelin1-0/+92