2 Commits (3a81b9f571a6b7edd83b3d5f27c3c95d9b1c9d5c)

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