Merge branch 'mm/status-porcelain-format-i18n-fix'
commit4ab9211ac28a39f275db92ca1b91f638538c7e43
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Mar 2014 23:31:25 +0000 (31 16:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Mar 2014 23:31:25 +0000 (31 16:31 -0700)
tree3909a302ac6fd4743919883524c6d2b01a13b670
parent1d9aaed2fa43dde6ea223b42c0a1a5a714343988
parent7a76c28ff29d6f819bb0bf9852b858f974b5c53a
Merge branch 'mm/status-porcelain-format-i18n-fix'

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