merge script: allow custom strategies
The idea comes from v1.6.1-rc1~294^2~7 (builtin-merge: allow using a custom strategy, 2008-07-30). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Aug 17, 2010 at 02:05 UTC
e69dccf8cd4576be804597b2960aa7d0020a65db
1 file changed
+6
-2
contrib/examples/git-merge.sh
+6
-2
@@ -193,9 +193,13 @@ parse_config () {
193
shift
194
case " $all_strategies " in
195
*" $1 "*)
196
- use_strategies="$use_strategies$1 " ;;
196
+ use_strategies="$use_strategies$1 "
197
+ ;;
198
*)
198
- die "available strategies are: $all_strategies" ;;
199
+ type "git-merge-$1" >/dev/null 2>&1 ||
200
+ die "available strategies are: $all_strategies"
201
+ use_strategies="$use_strategies$1 "
202
+ ;;
203
esac
204
;;
205
-X)