From e4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0 Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Tue, 13 Sep 2005 08:22:26 +0200 Subject: [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. Otherwise we would regret when Fredrik comes up with another merge algorithm with different pros-and-cons with the current one. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- git-merge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git-merge.sh') diff --git a/git-merge.sh b/git-merge.sh index e51e73499..818e6b772 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -12,9 +12,9 @@ usage () { die "git-merge [-n] [-s ]... +" } -# all_strategies='resolve fredrik stupid octopus' +# all_strategies='resolve recursive stupid octopus' -all_strategies='fredrik octopus resolve stupid' +all_strategies='recursive octopus resolve stupid' default_strategies='resolve octopus' use_strategies= -- cgit v1.2.1