git-rebase--am: remove unnecessary --3way option

Since 22db240 (git-am: propagate --3way options as well, 2008-12-04),
the --3way has been propageted across failure, so it is since
pointless to pass it to git-am when resuming.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 5acfa0037fe2c84c3e0a85d1e31ea8118efd835b..95608c6c2777b5ed02b1e1d86e84b9b548e6b125 100644 (file)
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -7,12 +7,12 @@
 
 case "$action" in
 continue)
-       git am --resolved --3way --resolvemsg="$RESOLVEMSG" &&
+       git am --resolved --resolvemsg="$RESOLVEMSG" &&
        move_to_original_branch
        exit
        ;;
 skip)
-       git am --skip -3 --resolvemsg="$RESOLVEMSG" &&
+       git am --skip --resolvemsg="$RESOLVEMSG" &&
        move_to_original_branch
        exit
        ;;