OSDN Git Service

Merge branch 'mm/status-porcelain-format-i18n-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Mar 2014 23:31:25 +0000 (16:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Mar 2014 23:31:25 +0000 (16:31 -0700)
* mm/status-porcelain-format-i18n-fix:
  status: disable translation when --porcelain is used

1  2 
wt-status.c
wt-status.h

diff --cc wt-status.c
Simple merge
diff --cc wt-status.h
Simple merge