Git 2.5.2

[git-core/git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index 8733071..3af351f 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -393,11 +393,6 @@ then
     keepcr=t
 fi
 
-if test "$(git config --bool --get am.threeWay)" = true
-then
-    threeway=t
-fi
-
 while test $# != 0
 do
        case "$1" in
@@ -409,8 +404,6 @@ it will be removed. Please do not use it anymore."
                ;;
        -3|--3way)
                threeway=t ;;
-       --no-3way)
-               threeway=f ;;
        -s|--signoff)
                sign=t ;;
        -u|--utf8)
@@ -680,8 +673,6 @@ fi
 if test "$(cat "$dotest/threeway")" = t
 then
        threeway=t
-else
-       threeway=f
 fi
 git_apply_opt=$(cat "$dotest/apply-opt")
 if test "$(cat "$dotest/sign")" = t