run_command: return exit code as positive value

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

diff --git a/builtin-merge.c b/builtin-merge.c
index af9adab300de98026b23a58b1d8b40f9395ff11a..96ecaf4e484639c844d48884ae2fd559d5e9a352 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;
        }
 }