1 Commits (85d106c267ec26f398e0aaf352d8011f661c459a)

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