aboutsummaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
Commit message (Expand)AuthorAge
* Documentation/technical: convert plain text files to asciidocThomas Ackermann2012-10-16
* [PATCH] Finish documenting trivial merge rulesDaniel Barkalow2005-09-24
* [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Daniel Barkalow2005-09-10