diff options
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 129577987b..2f232ad3b4 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2223,10 +2223,9 @@ int merge_recursive_generic(struct merge_options *o, return clean; } - if (active_cache_changed && - write_locked_index(&the_index, &lock, COMMIT_LOCK)) + if (write_locked_index(&the_index, &lock, + COMMIT_LOCK | SKIP_IF_UNCHANGED)) return err(o, _("Unable to write index.")); - rollback_lock_file(&lock); return clean ? 0 : 1; } |