mergetool--lib: improve show_tool_help() output

diff --git a/diff-no-index.c b/diff-no-index.c
index 0b46a0f79f1376a935e4a0a408a224de711b60cb..74da659368e4db67715a9c81dc7a5e0edcd3bcce 100644 (file)
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -258,8 +258,7 @@ void diff_no_index(struct rev_info *revs,
        DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
 
        revs->max_count = -2;
-       if (diff_setup_done(&revs->diffopt) < 0)
-               die("diff_setup_done failed");
+       diff_setup_done(&revs->diffopt);
 
        setup_diff_pager(&revs->diffopt);
        DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);