| commit | cd1d61c44fb5c3d1c8e4c19becb66d90bbb9c676 | |
| author | Bert Wesarg <bert.wesarg@googlemail.com> | |
| Mon, 1 Mar 2010 21:46:25 +0000 (1 22:46 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Mar 2010 19:43:40 +0000 (2 11:43 -0800) | ||
| tree | 339840994a9f049d433d90b73762679a6d6b0485 | treesnapshot (tar.gz zip) |
| parent | e923eaeb901ff056421b9007adcbbce271caa7b6 | commitdiff |
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>
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 | diffblobblamehistory | |
| xdiff/xdiff.h | diffblobblamehistory | |
| xdiff/xmerge.c | diffblobblamehistory |