Merge branch 'mm/status-porcelain-format-i18n-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 19:07:06 +0000 (12:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 19:07:06 +0000 (12:07 -0700)
commit360f852d249f365009b63cab70b50d6f5b5c65e7
treeb06a0709420c771a91b6b1d9b5f68e678e09ef79
parent86b4c1639c4a44fa8c10a7c438c5af24ca87e2a9
parent7a76c28ff29d6f819bb0bf9852b858f974b5c53a
Merge branch 'mm/status-porcelain-format-i18n-fix' into maint

* mm/status-porcelain-format-i18n-fix:
  status: disable translation when --porcelain is used
wt-status.c