1 files changed, 2 insertions, 1 deletions
diff --git a/rerere.c b/rerere.c
index 5bb5316cda..8e5532b1ff 100644
--- a/rerere.c
+++ b/rerere.c
@@ -352,7 +352,8 @@ int setup_rerere(struct string_list *merge_rr)
 		return -1;
 
 	merge_rr_path = xstrdup(git_path("MERGE_RR"));
-	fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1);
+	fd = hold_lock_file_for_update(&write_lock, merge_rr_path,
+				       LOCK_DIE_ON_ERROR);
 	read_rr(merge_rr);
 	return fd;
 }