summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
AgeCommit message (Expand)AuthorFilesLines
2012-10-16Documentation/technical: convert plain text files to asciidocLibravatar Thomas Ackermann1-18/+18
2005-09-24[PATCH] Finish documenting trivial merge rulesLibravatar Daniel Barkalow1-10/+39
2005-09-10[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Libravatar Daniel Barkalow1-0/+92