Clarify kind of conflict in merge-one-file helper
Not as verbose as the recursive merge driver, but better still. Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
Showing
想要评论请 注册 或 登录
Not as verbose as the recursive merge driver, but better still. Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>