Merge branch 'mm/status-porcelain-format-i18n-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 19:07:06 +0000 (8 12:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 19:07:06 +0000 (8 12:07 -0700)
* mm/status-porcelain-format-i18n-fix:
  status: disable translation when --porcelain is used

1  2 
wt-status.c

diff --cc wt-status.c
Simple merge