From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Jun 2015 19:21:45 +0000 (-0700)
Subject: Merge branch 'rl/am-3way-config'
X-Git-Tag: v2.5.0-rc0~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63;p=thirdparty%2Fgit.git

Merge branch 'rl/am-3way-config'

"git am" learned am.threeWay configuration variable.

* rl/am-3way-config:
  git-am: add am.threeWay config variable
  t4150-am: refactor am -3 tests
  git-am.sh: fix initialization of the threeway variable
---

4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63