aboutsummaryrefslogtreecommitdiff
path: root/Documentation/technical
Commit message (Expand)AuthorAge
* [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Daniel Barkalow2005-09-10