3 Commits (85d501ce63d3c3b1331f9e51252c128c95e0adf1)

Author SHA1 Message Date
Thomas Ackermann 5316c8e939 Documentation/technical: convert plain text files to asciidoc 13 years ago
Daniel Barkalow 7061f5c2c5 [PATCH] Finish documenting trivial merge rules 20 years ago
Daniel Barkalow 3d89cb4f3f [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. 20 years ago