diff options
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ecf8db0b71..8dba939d8f 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3643,7 +3643,7 @@ int merge_recursive_generic(struct merge_options *o, } } - hold_locked_index(&lock, LOCK_DIE_ON_ERROR); + repo_hold_locked_index(the_repository, &lock, LOCK_DIE_ON_ERROR); clean = merge_recursive(o, head_commit, next_commit, ca, result); if (clean < 0) { |