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>
Remi Lespinet committed
Jun 4, 2015 at 17:04 UTC
1164db977e3c2dd54a4d90d4aded7ca64791d16b
1 file changed
+1
git-am.sh
+1
@@ -378,6 +378,7 @@ committer_date_is_author_date=
378
ignore_date=
379
allow_rerere_autoupdate=
380
gpg_sign_opt=
381
+threeway=
382
383
if test "$(git config --bool --get am.messageid)" = true
384
then