projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b541248) | patch
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)
commitc236bcd06138bcbc929b86ad1a513635bf4847b2
tree4e1b02387bf93c73b7fc487aa417cb0ae1170d57tree | snapshot
parentb541248467fa47979a34e3f1c5bbe3308fbdc4d1commit | diff
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>
builtin-merge-recursive.c diff | blob | history
ll-merge.c diff | blob | history
Git—the stupid content tracker