projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 15b4f7a) | patch
rerere: use ll_merge() instead of using xdl_merge()
authorJunio C Hamano <gitster@pobox.com>
Sat, 16 Jan 2010 06:50:01 +0000 (22:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 07:45:33 +0000 (23:45 -0800)
commit88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e
tree4eead9d7f1d7fb95b0fe6f367fbf4a330f2c485dtree | snapshot
parent15b4f7a68d8c3c8ee28424415b203f61202d65d1commit | diff
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>
rerere.c diff | blob | history
Git—the stupid content tracker