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>
git-mirror · Jun 4, 2015 · 1164db9 · 1164db9
1 parent 3d4a3ff
commit 1164db9
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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=
+threeway=
 
 if test "$(git config --bool --get am.messageid)" = true
 then