summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)AuthorFilesLines
2005-09-20[PATCH] Documentation: Update all files to use the new gitlink: macroLibravatar Sergey Vlasov1-1/+1
2005-09-10'git-merge': Documentation.Libravatar Junio C Hamano1-0/+52