diff --git a/git-am.sh b/git-am.sh
index ed54e716d9a33a2be9525e48f5f7019e13ea0e3a..4b157fe5d536fdbdbf85e0e06c419b5927a90867 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
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.
- echo " $git_apply_opt" >"$dotest/apply_opt_extra"
+ # -i can and must be given when resuming.
+ echo " $git_apply_opt" >"$dotest/apply-opt"
+ echo "$threeway" >"$dotest/threeway"
echo "$sign" >"$dotest/sign"
echo "$utf8" >"$dotest/utf8"
echo "$keep" >"$dotest/keep"
then
keep=-k
fi
-git_apply_opt=$(cat "$dotest/apply_opt_extra")
+if test "$(cat "$dotest/threeway")" = t
+then
+ threeway=t
+fi
+git_apply_opt=$(cat "$dotest/apply-opt")
if test "$(cat "$dotest/sign")" = t
then
SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '