summaryrefslogtreecommitdiffstats
path: root/Documentation/technical/trivial-merge.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
* [PATCH] Finish documenting trivial merge rulesDaniel Barkalow2005-09-251-10/+39
* [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Daniel Barkalow2005-09-111-0/+92