summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)AuthorFilesLines
2005-09-10'git-merge': Documentation.Libravatar Junio C Hamano1-0/+52