mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2014-10-24 11:27:22 -07:00
parent eeff891ac7
commit 08e3ce5a20
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/merge.c
View File

@ -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; const char *filename;
FILE *fp; FILE *fp;
@ -1557,7 +1557,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
fprintf(stderr, _("Automatic merge went well; " fprintf(stderr, _("Automatic merge went well; "
"stopped before committing as requested\n")); "stopped before committing as requested\n"));
else else
ret = suggest_conflicts(option_renormalize); ret = suggest_conflicts();
done: done:
free(branch_to_free); free(branch_to_free);