Merge branch 'gb/am-hg-patch'
commit79814585b78329b5009b7684290bc0c8872220db
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:17 +0000 (5 12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:17 +0000 (5 12:36 -0700)
treec4ef8ae29075d2e76ec1461ab6c4eae637445af4
parent9eb765d5f400aa922a46f1727259ce114b78561c
parent0cfd112032017ab68ed576f6bb5258452084ebf1
Merge branch 'gb/am-hg-patch'

* gb/am-hg-patch:
  am: preliminary support for hg patches
git-am.sh