summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-11 00:46:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-11 02:46:53 (GMT)
commit720d150c48fc35fca13c6dfb3c76d60e4ee83b87 (patch)
tree7b6a98c985a6bc2f5e0a66c3ea15ac0a0e081269 /git-merge.sh
parent0f69be537618036c45bc07919248b88afbf7af3e (diff)
downloadgit-720d150c48fc35fca13c6dfb3c76d60e4ee83b87.zip
git-720d150c48fc35fca13c6dfb3c76d60e4ee83b87.tar.gz
git-720d150c48fc35fca13c6dfb3c76d60e4ee83b87.tar.bz2
Add a new merge strategy by Fredrik Kuivinen.
I really wanted to try this out, instead of asking for an adjustment to the 'git merge' driver and waiting. For now the new strategy is called 'fredrik' and not in the list of default strategies to be tried. The script wants Python 2.4 so this commit also adjusts Debian and RPM build procecure files. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 55b0c72..a784e0f 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -14,7 +14,7 @@ usage () {
# all_strategies='resolve fredrik stupid octopus'
-all_strategies='resolve octopus stupid'
+all_strategies='fredrik octopus resolve stupid'
default_strategies='resolve octopus'
use_strategies=