diff --git a/git-rebase.sh b/git-rebase.sh
index 7d3a5d0e718eebe6fb5d1fa3362f2a7087d6e691..a7373c0532fad447263e7199d0b8ec2908c683c9 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
exit $?
fi
exit $?
fi
-if test "@@NO_PYTHON@@" && test "$strategy" = "recursive"
+if test "@@NO_PYTHON@@" && test "$strategy" = "recursive-old"
then
then
- die 'The recursive merge strategy currently relies on Python,
+ die 'The recursive-old merge strategy is written in Python,
which this installation of git was not configured with. Please consider
which this installation of git was not configured with. Please consider
-a different merge strategy (e.g. octopus, resolve, stupid, ours)
+a different merge strategy (e.g. recursive, resolve, or stupid)
or install Python and git with Python support.'
fi
or install Python and git with Python support.'
fi