Change fetch_pack() and friends to take string_list arguments

diff --git a/builtin/merge.c b/builtin/merge.c
index e9871ab96bffceaf85714906776395881f2af0f7..0ec8f0d449e505a52166b560f43f30d8c30cfbaf 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -404,8 +404,7 @@ static void finish(struct commit *head_commit,
                opts.output_format |=
                        DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
                opts.detect_rename = DIFF_DETECT_RENAME;
-               if (diff_setup_done(&opts) < 0)
-                       die(_("diff_setup_done failed"));
+               diff_setup_done(&opts);
                diff_tree_sha1(head, new_head, "", &opts);
                diffcore_std(&opts);
                diff_flush(&opts);