From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 16 Jan 2010 06:50:01 +0000 (-0800)
Subject: rerere: use ll_merge() instead of using xdl_merge()
X-Git-Tag: v1.7.0-rc0~53^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e?ds=inline;hp=88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e

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>
---