diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-16 21:45:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-16 23:45:33 -0800 |
| commit | 15b4f7a68d8c3c8ee28424415b203f61202d65d1 (patch) | |
| tree | a580a0e5f784046497a05eae485f1e90154b8bdf /git-rebase--interactive.sh | |
| parent | xdl_merge(): allow passing down marker_size in xmparam_t (diff) | |
| download | tgif-15b4f7a68d8c3c8ee28424415b203f61202d65d1.tar.xz | |
merge-tree: use ll_merge() not xdl_merge()
ll_merge() interface was designed to merge contents under git control
while taking per-path attributes into account. Update the three-way
merge implementation used by merge-tree to use it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
0 files changed, 0 insertions, 0 deletions