2 Commits (d5cc2de9ff57d2f6734f6e6e34addc2fae1b5b0e)

Author SHA1 Message Date
Daniel Barkalow 7061f5c2c5 [PATCH] Finish documenting trivial merge rules 19 years ago
Daniel Barkalow 3d89cb4f3f [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. 19 years ago