2 Commits (c1e335a43fb4c2f422b4d78693b2344114209632)

Author SHA1 Message Date
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