2 Commits (afcb536f288f28bb37acf11a5666a219b8f20200)

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