From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Aug 2015 22:45:33 +0000 (-0700)
Subject: Merge branch 'pt/am-builtin'
X-Git-Tag: v2.6.0-rc0~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74702c382597ce34e7ce884e29d23e1eedb52196;p=thirdparty%2Fgit.git

Merge branch 'pt/am-builtin'

Rewrite "am" in "C".

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

74702c382597ce34e7ce884e29d23e1eedb52196