Merge branch 'rl/am-3way-config'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:45 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:45 +0000 (12:21 -0700)
commit4b64c8a...eea6b44fb8505ec46cccf8255c7e6c63
tree09b7be5...4670d10c27896b27561382c4dbe73f6fcopy hash to clipboard (tree)
parent49ac735...da163b0f8a32ce71723b2071f962d3fdcopy hash to clipboard (diff)
parentd96a275...91bae1800cd43be0651e886e7e042a17copy hash to clipboard (diff)
Documentation/config.txt
git-am.sh