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

Signed-off-by: Daniel Barkalow
Signed-off-by: Junio C Hamano <junkio@cox.net>

2005-09-10 18:27:41 -07:00

..

trivial-merge.txt

[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.

2005-09-10 18:27:41 -07:00