Merge branch 'en/sequencer-rollback-lock-cleanup'

Code clean-up. * en/sequencer-rollback-lock-cleanup: sequencer: remove duplicate rollback_lock_file() call
4 years ago · f3e63abb27
1 changed files with 0 additions and 1 deletions
--- 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 */