diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index c9604a67d14adb7c92732c004ba8c6fe5378fc66..c815a2412c2f33556ad712d328eaa80241c07bda 100644 (file)
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
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
;;