summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
AgeCommit message (Expand)Author
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ă…gren
2012-10-16Documentation/technical: convert plain text files to asciidocThomas Ackermann
2005-09-25[PATCH] Finish documenting trivial merge rulesDaniel Barkalow
2005-09-11[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Daniel Barkalow