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

Since the very beginning when we added the "renormalizing" parameter
to this function with 7610fa57 (merge-recursive --renormalize,
2010-08-05), nobody seems to have ever referenced it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/merge.c b/builtin/merge.c
index 41fb66dec2c2fd9645a72c28c362067fb3bcc16c..f6894c7a918df4802ff29801e7384a9974fa2aea 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -884,7 +884,7 @@ static int finish_automerge(struct commit *head,
        return 0;
 }
 
        return 0;
 }
 

-static int suggest_conflicts(int renormalizing)
+static int suggest_conflicts(void)

 {
        const char *filename;
        FILE *fp;
 {
        const char *filename;
        FILE *fp;


@@ -1557,7 +1557,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                fprintf(stderr, _("Automatic merge went well; "
                        "stopped before committing as requested\n"));
        else
                fprintf(stderr, _("Automatic merge went well; "
                        "stopped before committing as requested\n"));
        else

-               ret = suggest_conflicts(option_renormalize);
+               ret = suggest_conflicts();

 
 done:
        free(branch_to_free);
 
 done:
        free(branch_to_free);