Andrew's git / gitweb.git / diff
?
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)
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>
No differences found