summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-24 18:27:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-24 18:28:30 (GMT)
commit08e3ce5a20d738746b2a7700be6d3954bf01a2b9 (patch)
tree5cb4733049a406d30ee2d2100e38c42b9919baf2 /builtin/merge.c
parenteeff891ac756fd97a05476446f15269b714ce4cc (diff)
downloadgit-08e3ce5a20d738746b2a7700be6d3954bf01a2b9.zip
git-08e3ce5a20d738746b2a7700be6d3954bf01a2b9.tar.gz
git-08e3ce5a20d738746b2a7700be6d3954bf01a2b9.tar.bz2
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>
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 41fb66d..f6894c7 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);