diff options
| author |  Bert Wesarg <bert.wesarg@googlemail.com> | 2010-03-01 22:46:25 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-02 11:43:40 -0800 |
| commit | cd1d61c44fb5c3d1c8e4c19becb66d90bbb9c676 (patch) | |
| tree | 339840994a9f049d433d90b73762679a6d6b0485 /builtin/gc.c | |
| parent | Git 1.7.0 (diff) | |
| download | tgif-cd1d61c44fb5c3d1c8e4c19becb66d90bbb9c676.tar.xz | |
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>
Diffstat (limited to 'builtin/gc.c')
0 files changed, 0 insertions, 0 deletions