Merge branch 'jn/status-translatable' into next
commitd00d23dca8667649218012f158c83601a7e595ba
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2011 00:38:58 +0000 (9 16:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2011 00:38:58 +0000 (9 16:38 -0800)
treeb171eae059088783a27610cf5a6d5e028be79d8d
parent9651bc59230eddff675c25daab6424ee06dc1853
parentb926c0d10df6c5bdc8bf9a2fc1431e8edb673e4d
Merge branch 'jn/status-translatable' into next

* jn/status-translatable:
  commit, status: use status_printf{,_ln,_more} helpers
  commit: refer to commit template as s->fp
  wt-status: add helpers for printing wt-status lines

Conflicts:
builtin/commit.c
builtin/commit.c
wt-status.c
wt-status.h