mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
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>
This commit is contained in:
parent
5d75a52b3a
commit
e69dccf8cd
|
@ -193,9 +193,13 @@ parse_config () {
|
|||
shift
|
||||
case " $all_strategies " in
|
||||
*" $1 "*)
|
||||
use_strategies="$use_strategies$1 " ;;
|
||||
use_strategies="$use_strategies$1 "
|
||||
;;
|
||||
*)
|
||||
die "available strategies are: $all_strategies" ;;
|
||||
type "git-merge-$1" >/dev/null 2>&1 ||
|
||||
die "available strategies are: $all_strategies"
|
||||
use_strategies="$use_strategies$1 "
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
-X)
|
||||
|
|
Loading…
Reference in a new issue