merge-recursive: make "CONFLICT (rename/delete)" message show both paths

diff --git a/pack-bitmap.c b/pack-bitmap.c
index b949e517167dbac6c4c347e0a2cbdf8ca2dabbcf..39bcc168463fc7358ab7cb4e963e6ed8bde94804 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -266,7 +266,7 @@ static int open_pack_bitmap_1(struct packed_git *packfile)
                return -1;
 
        idx_name = pack_bitmap_filename(packfile);
-       fd = git_open_noatime(idx_name);
+       fd = git_open(idx_name);
        free(idx_name);
 
        if (fd < 0)