Merge branch 'pt/am-builtin'
commit74702c382597ce34e7ce884e29d23e1eedb52196
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2015 22:45:33 +0000 (26 15:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2015 22:45:33 +0000 (26 15:45 -0700)
tree7eb3d572af32c7ef2f42fd4b9a8bb817c7c2c429
parentb7d2a15b9f5cdbed7e8dbcc3fff0ea1ae92ed764
parent1fb5a0ea96435e0bf4459fe5987df4c6b8a2fc76
Merge branch 'pt/am-builtin'

Rewrite "am" in "C".

* pt/am-builtin:
  i18n: am: fix typo in description of -b option
builtin/am.c