diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-10-24 11:27:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-24 11:28:30 -0700 |
| commit | 08e3ce5a20d738746b2a7700be6d3954bf01a2b9 (patch) | |
| tree | 5cb4733049a406d30ee2d2100e38c42b9919baf2 | |
| parent | git-tag.txt: Add a missing hyphen to `-s` (diff) | |
| download | tgif-08e3ce5a20d738746b2a7700be6d3954bf01a2b9.tar.xz | |
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>
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 41fb66dec2..f6894c7a91 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -884,7 +884,7 @@ static int finish_automerge(struct commit *head, return 0; } -static int suggest_conflicts(int renormalizing) +static int suggest_conflicts(void) { 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 - ret = suggest_conflicts(option_renormalize); + ret = suggest_conflicts(); done: free(branch_to_free); |