1 Commits (7c6ef2f2142f0a4c22b5505d95553cac17867a21)

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