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