summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
Commit message (Expand)AuthorAgeFilesLines
* 'git-merge': Documentation.Junio C Hamano2005-09-101-0/+52