summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
AgeCommit message (Collapse)AuthorFilesLines
2005-09-10'git-merge': Documentation.Libravatar Junio C Hamano1-0/+52
... and add link from git.txt, as usual. Signed-off-by: Junio C Hamano <junkio@cox.net>