From: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Date: Thu, 4 Jun 2015 15:04:53 +0000 (+0200)
Subject: git-am.sh: fix initialization of the threeway variable
X-Git-Tag: v2.5.0-rc0~21^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1164db977e3c2dd54a4d90d4aded7ca64791d16b

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 a67d0f9898..4696998d4e 100755
--- 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