1 Commits (c6ae61590f79cb7ff848ef0f2c33396507e60442)

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