]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/merge.c
builtin/merge.c: drop a parameter that is never used
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 18:27:22 +0000 (11:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 18:28:30 +0000 (11:28 -0700)
commit08e3ce5a20d738746b2a7700be6d3954bf01a2b9
tree5cb4733049a406d30ee2d2100e38c42b9919baf2
parenteeff891ac756fd97a05476446f15269b714ce4cc
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>
builtin/merge.c