Andrew's git / gitweb.git / diff
?
git-merge-recursive: learn to honor merge.conflictstyle
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Aug 2008 17:59:16 +0000 (10:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 02:41:44 +0000 (19:41 -0700)
This teaches the low-level ll_xdl_merge() routine to honor
merge.conflictstyle configuration variable, so that merge-recursive
strategy can show the conflicts in the style of user's choice.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found