Merge branch 'da/mergetool-xxdiff-hotkey'

diff --git a/sequencer.c b/sequencer.c
index 050e28bbc3d136509e8b7d909b27e9d954fa7754..28061dcb78b5db5711f77da1026c0cb81acee27b 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -323,7 +323,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
        char **xopt;
        static struct lock_file index_lock;
 
-       hold_locked_index(&index_lock, 1);
+       hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
 
        read_cache();