summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sequencer.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c
index c358100299..a65d7a6b7c 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -3691,7 +3691,6 @@ static int do_merge(struct repository *r,
NULL, 0);
rollback_lock_file(&lock);
- rollback_lock_file(&lock);
ret = run_command(&cmd);
/* force re-reading of the cache */