make union merge an xdl merge favor
authorBert Wesarg <bert.wesarg@googlemail.com>
Mon, 1 Mar 2010 21:46:25 +0000 (22:46 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Mar 2010 19:43:40 +0000 (11:43 -0800)
commitcd1d61c...4fb5c3d1c8e4c19becb66d90bbb9c676
tree3398409...4a9f049d433d90b73762679a6d6b0485copy hash to clipboard (tree)
parente923eae...901ff056421b9007adcbbce271caa7b6copy hash to clipboard (diff)
ll-merge.c
xdiff/xdiff.h
xdiff/xmerge.c