summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
AgeCommit message (Collapse)AuthorFilesLines
2006-12-17Fix mis-mark-up in git-merge-file.txt documentationLibravatar Junio C Hamano1-2/+2
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-12-16Document git-merge-fileLibravatar Johannes Schindelin1-0/+92
Most of this is derived from the documentation of RCS merge. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>