summaryrefslogtreecommitdiff
path: root/Documentation/technical
AgeCommit message (Expand)Author
2005-09-24[PATCH] Finish documenting trivial merge rulesDaniel Barkalow
2005-09-10[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Daniel Barkalow