builtin/merge.c: drop a parameter that is never used

diff --git a/diff.c b/diff.c
index a04a34d0487f231481a7c9c475ac4a3e92b5ed2d..e34bf971207f7737c3b1a10968acd8ffb3ecf93d 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3219,6 +3219,9 @@ void diff_setup_done(struct diff_options *options)
 {
        int count = 0;
 
+       if (options->set_default)
+               options->set_default(options);
+
        if (options->output_format & DIFF_FORMAT_NAME)
                count++;
        if (options->output_format & DIFF_FORMAT_NAME_STATUS)