Merge branch 'tf/doc-pt-br'

diff --git a/builtin-merge.c b/builtin-merge.c
index f4de73fa9d8d4ca4d311cb86d6901346ceb0d19f..b6b84286b26a4317dfd5185ae83fd861c6f9fa7d 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -598,7 +598,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;
        }
 }