summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
Commit message (Expand)AuthorAgeFilesLines
* Documentation/technical: convert plain text files to asciidocThomas Ackermann2012-10-161-18/+18
* [PATCH] Finish documenting trivial merge rulesDaniel Barkalow2005-09-241-10/+39
* [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Daniel Barkalow2005-09-101-0/+92