diff --git a/git-merge.sh b/git-merge.sh
index e8db52725c2d5ea023ec6d875cdfbc7c20240a31..ba42260426296b63070a1fbdc22a9b77ea5ac412 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
'')
case "$#" in
1)
- use_strategies="$default_twohead_strategies" ;;
+ var="`git-repo-config --get pull.twohead`"
+ if test -n "$var"
+ then
+ use_strategies="$var"
+ else
+ use_strategies="$default_twohead_strategies"
+ fi ;;
*)
- use_strategies="$default_octopus_strategies" ;;
+ var="`git-repo-config --get pull.octopus`"
+ if test -n "$var"
+ then
+ use_strategies="$var"
+ else
+ use_strategies="$default_octopus_strategies"
+ fi ;;
esac
;;
esac