hold_locked_index(): align error handling with hold_lockfile_for_update()

diff --git a/merge-recursive.c b/merge-recursive.c
index 9041c2f149c01134ce02119354455894533e713c..8442068716035b61a448514e3fa7957aed51a597 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2124,7 +2124,7 @@ int merge_recursive_generic(struct merge_options *o,
                }
        }
 
-       hold_locked_index(lock, 1);
+       hold_locked_index(lock, LOCK_DIE_ON_ERROR);
        clean = merge_recursive(o, head_commit, next_commit, ca,
                        result);
        if (clean < 0)