![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 05:45:40 +0000 (21:45 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 07:45:33 +0000 (23:45 -0800) | ||
| commit | 15b4f7a68d8c3c8ee28424415b203f61202d65d1 | |
| tree | a580a0e5f784046497a05eae485f1e90154b8bdf | tree | snapshot |
| parent | 9914cf468941067b4f3deb9c69c11af3f5b45ccc | commit | diff |
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>
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>
| merge-file.c | diff | blob | history | |
| merge-tree.c | diff | blob | history |