apply: use SWAP macro

[thirdparty/git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 23d6992f4037b37a9c3e133001af16595e8da394..d3272094430ccd3914c8214df73ba8e11363cfa7 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2133,7 +2133,7 @@ int merge_recursive_generic(struct merge_options *o,
                }
        }
 
-       hold_locked_index(lock, 1);
+       hold_locked_index(lock, LOCK_DIE_ON_ERROR);
        clean = merge_recursive(o, head_commit, next_commit, ca,
                        result);
        if (clean < 0)