summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-am.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/git-am.sh b/git-am.sh
index ed54e716d9..13c02d6ade 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -247,10 +247,11 @@ else
exit 1
}
- # -s, -u, -k, --whitespace, -C and -p flags are kept
+ # -s, -u, -k, --whitespace, -3, -C and -p flags are kept
# for the resuming session after a patch failure.
- # -3 and -i can and must be given when resuming.
+ # -i can and must be given when resuming.
echo " $git_apply_opt" >"$dotest/apply_opt_extra"
+ echo "$threeway" >"$dotest/threeway"
echo "$sign" >"$dotest/sign"
echo "$utf8" >"$dotest/utf8"
echo "$keep" >"$dotest/keep"
@@ -283,6 +284,10 @@ if test "$(cat "$dotest/keep")" = t
then
keep=-k
fi
+if test "$(cat "$dotest/threeway")" = t
+then
+ threeway=t
+fi
git_apply_opt=$(cat "$dotest/apply_opt_extra")
if test "$(cat "$dotest/sign")" = t
then