projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e923eae) | patch
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)
commitcd1d61c44fb5c3d1c8e4c19becb66d90bbb9c676
tree339840994a9f049d433d90b73762679a6d6b0485tree | snapshot
parente923eaeb901ff056421b9007adcbbce271caa7b6commit | diff
make union merge an xdl merge favor

The current union merge driver is implemented as an post process.  But the
xdl_merge code is quite capable to produce the result by itself.  Therefore
move it there.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
ll-merge.c diff | blob | history
xdiff/xdiff.h diff | blob | history
xdiff/xmerge.c diff | blob | history
Git—the stupid content tracker