Merge branch 'tb/document-status-u-tradeoff' into maint
commit5234b41f68ca1ab788513fdc059f9f2e01fd3f6e
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 15:12:47 +0000 (12 08:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 15:12:47 +0000 (12 08:12 -0700)
treeae50a574a8bee32140e7efeaa784f7b3b176c73e
parent3a51467b94306e77c1b69b374bac33b6672bc177
parent62901179cfbb86e31a4bed098cee9734a701912b
Merge branch 'tb/document-status-u-tradeoff' into maint

* tb/document-status-u-tradeoff:
  i18n: make the translation of -u advice in one go
wt-status.c