[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.
Signed-off-by: Daniel Barkalow
Signed-off-by: NJunio C Hamano <junkio@cox.net>
Showing
想要评论请 注册 或 登录
Signed-off-by: Daniel Barkalow
Signed-off-by: NJunio C Hamano <junkio@cox.net>