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>
Junio C Hamano committed
Oct 24, 2014 at 11:27 UTC
08e3ce5a20d738746b2a7700be6d3954bf01a2b9
1 file changed
+2
-2
builtin/merge.c
+2
-2
@@ -884,7 +884,7 @@ static int finish_automerge(struct commit *head,
884
return 0;
885
}
886
887
-static int suggest_conflicts(int renormalizing)
887
+static int suggest_conflicts(void)
888
{
889
const char *filename;
890
FILE *fp;
@@ -1557,7 +1557,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1557
fprintf(stderr, _("Automatic merge went well; "
1558
"stopped before committing as requested\n"));
1559
else
1560
- ret = suggest_conflicts(option_renormalize);
1560
+ ret = suggest_conflicts();
1561
1562
done:
1563
free(branch_to_free);