X-Git-Url: http://rtime.felk.cvut.cz/gitweb/git.git/blobdiff_plain/0c4f21e452dca5a705c36ca7e363c1a3b3c2a5b8..08ac69685a5b6bea45df1fd62ea1d9b7c0258d0b:/builtin-merge.c

diff --git a/builtin-merge.c b/builtin-merge.c
index 82b546689..0b12fb315 100644
--- 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;
 	}
 }