1 Commits (b93aa3ec9506618e9a22c04d775b35f31e7e068f)

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