| commit | 88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 16 Jan 2010 06:50:01 +0000 (15 22:50 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 07:45:33 +0000 (16 23:45 -0800) | ||
| tree | 4eead9d7f1d7fb95b0fe6f367fbf4a330f2c485d | treesnapshot (tar.gz zip) |
| parent | 15b4f7a68d8c3c8ee28424415b203f61202d65d1 | commitdiff |
rerere: use ll_merge() instead of using xdl_merge()
This allows us to pay attention to the attribute settings and custom
merge driver the user sets up.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This allows us to pay attention to the attribute settings and custom
merge driver the user sets up.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| rerere.c | diffblobblamehistory |