author | Junio C Hamano <gitster@pobox.com> | |
Sun, 20 Mar 2011 06:24:19 +0000 (23:24 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 20 Mar 2011 06:24:19 +0000 (23:24 -0700) | ||
commit | f4784b3eab2e12e7a8fda7431572753f3a970c63 | |
tree | d11fc4eafe18c0a9b7e008d316ed41783c40dc45 | tree | snapshot |
parent | 0d7f242110dc71666780a85fca14fbc8223879d4 | commit | diff |
parent | b926c0d10df6c5bdc8bf9a2fc1431e8edb673e4d | commit | diff |
Merge branch 'jn/status-translatable'
* 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
* 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 | diff1 | | diff2 | | blob | history |
wt-status.c | diff1 | | diff2 | | blob | history |
wt-status.h | diff1 | | diff2 | | blob | history |