Merge branch 'tb/document-status-u-tradeoff' into maint
authorJunio C Hamano <redacted>
Fri, 12 Apr 2013 15:12:47 +0000 (08:12 -0700)
committerJunio C Hamano <redacted>
Fri, 12 Apr 2013 15:12:47 +0000 (08:12 -0700)
* tb/document-status-u-tradeoff:
  i18n: make the translation of -u advice in one go

1  2 
wt-status.c

diff --cc wt-status.c
Simple merge
git clone https://git.99rst.org/PROJECT