From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Aug 2008 17:59:16 +0000 (-0700)
Subject: git-merge-recursive: learn to honor merge.conflictstyle
X-Git-Tag: v1.6.1-rc1~195^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c236bcd06138bcbc929b86ad1a513635bf4847b2?hp=c236bcd06138bcbc929b86ad1a513635bf4847b2

git-merge-recursive: learn to honor merge.conflictstyle

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>
---