git-am.sh: fix initialization of the threeway variable

Initialization for the threeway variable was missing. This caused
a behavior change for command lines like:

threeway=t git am ...

This commit adds initialization for this variable.

Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-am.sh b/git-am.sh
index a67d0f98989706fa69df4cf7d6242ad9531eb337..4696998d4e4bd8f2355008cd35cf85600521d60b 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -378,6 +378,7 @@ committer_date_is_author_date=
 ignore_date=
 allow_rerere_autoupdate=
 gpg_sign_opt=
 ignore_date=
 allow_rerere_autoupdate=
 gpg_sign_opt=

+threeway=

 
 if test "$(git config --bool --get am.messageid)" = true
 then
 
 if test "$(git config --bool --get am.messageid)" = true
 then