summaryrefslogtreecommitdiff
path: root/Documentation/technical
AgeCommit message (Collapse)Author
2005-09-11[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Daniel Barkalow
Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano <junkio@cox.net>