Merge branch 'js/run-command-updates'

[git.git] / builtin-merge.c

diff --git a/builtin-merge.c b/builtin-merge.c
index 82b546689c500649285ea2c7825171f572c3758e..0b12fb31558d1cb59f9e2a8ab049ea944fe3060e 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -594,7 +594,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
                discard_cache();
                if (read_cache() < 0)
                        die("failed to read the cache");
-               return -ret;
+               return ret;
        }
 }