merge-tree: use ll_merge() not xdl_merge()

diff --git a/cache.h b/cache.h
index 310d9e672c8b1a66d5dfaf057db3af9eac028423..97b4a74d93cb5a5ea594c478f76602065a9d5188 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -338,6 +338,8 @@ static inline void remove_name_hash(struct cache_entry *ce)
 #define cache_name_exists(name, namelen, igncase) index_name_exists(&the_index, (name), (namelen), (igncase))
 #define cache_name_is_other(name, namelen) index_name_is_other(&the_index, (name), (namelen))
 #define resolve_undo_clear() resolve_undo_clear_index(&the_index)
+#define unmerge_cache_entry_at(at) unmerge_index_entry_at(&the_index, at)
+#define unmerge_cache(pathspec) unmerge_index(&the_index, pathspec)
 #endif
 
 enum object_type {