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