Merge branch 'js/am-3-merge-recursive-direct'

diff --git a/builtin/merge.c b/builtin/merge.c
index 19b3bc2f2fafe08d5ec03ab493d9d8f189db275b..148a9a51b9eb45b0b5113680aaf6a71c5db60e09 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -673,6 +673,8 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
                hold_locked_index(&lock, 1);
                clean = merge_recursive(&o, head,
                                remoteheads->item, reversed, &result);
+               if (clean < 0)
+                       exit(128);
                if (active_cache_changed &&
                    write_locked_index(&the_index, &lock, COMMIT_LOCK))
                        die (_("unable to write %s"), get_index_file());