You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 
Daniel Barkalow 3d89cb4f3f [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. 19 years ago
..
trivial-merge.txt [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. 19 years ago