Sync with 1.7.11.6

diff --git a/revision.c b/revision.c
index 04c7de87d089e576d6101628dc0417344a12f67e..442a9452334704d90e4457fdeb11014fb886c58a 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1863,8 +1863,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
        if (revs->combine_merges)
                revs->ignore_merges = 0;
        revs->diffopt.abbrev = revs->abbrev;
-       if (diff_setup_done(&revs->diffopt) < 0)
-               die("diff_setup_done failed");
+       diff_setup_done(&revs->diffopt);
 
        compile_grep_patterns(&revs->grep_filter);