merge-recursive: option to specify rename threshold
authorKevin Ballard <kevin@sb.org>
Mon, 27 Sep 2010 23:58:25 +0000 (16:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:15:56 +0000 (13:15 -0700)
The recursive merge strategy turns on rename detection but leaves the
rename threshold at the default. Add a strategy option to allow the user
to specify a rename threshold to use.

Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found