summaryrefslogtreecommitdiffstats
path: root/Documentation/technical/trivial-merge.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
* treewide: correct several "up-to-date" to "up to date"Martin Ă…gren2017-08-231-2/+2
* Documentation/technical: convert plain text files to asciidocThomas Ackermann2012-10-171-18/+18
* [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