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 fd7701c88a..935860a5c4 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -3572,7 +3572,6 @@ static int do_merge(struct repository *r,
unlink(git_path_cherry_pick_head(r));
rollback_lock_file(&lock);
- rollback_lock_file(&lock);
ret = run_command(&cmd);
/* force re-reading of the cache */