diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-20 09:24:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-20 09:24:19 +0300 |
| commit | f4784b3eab2e12e7a8fda7431572753f3a970c63 (patch) | |
| tree | d11fc4eafe18c0a9b7e008d316ed41783c40dc45 /git-mergetool--lib.sh | |
| parent | 0d7f242110dc71666780a85fca14fbc8223879d4 (diff) | |
| parent | b926c0d10df6c5bdc8bf9a2fc1431e8edb673e4d (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
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions