git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Fri, 29 Aug 2008 17:59:16 +0000 (10:59 -0700)
committer	Junio C Hamano <redacted>
	Sun, 31 Aug 2008 02:41:44 +0000 (19:41 -0700)
commit	c236bcd06138bcbc929b86ad1a513635bf4847b2
tree	4e1b02387bf93c73b7fc487aa417cb0ae1170d57	tree \| snapshot
parent	b541248467fa47979a34e3f1c5bbe3308fbdc4d1	commit \| 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 <redacted>

builtin-merge-recursive.c		diff \| blob \| history
ll-merge.c		diff \| blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT