diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:30 -0800 |
| commit | 20b3bc155864730380e8186f7d71ee2196a79603 (patch) | |
| tree | f1596c3324917b7fbbc652cd808a1b59e77483e2 /resolve-undo.c | |
| parent | Merge branch 'cb/test-lint-cp-a' (diff) | |
| parent | sideband: color lines with keyword only (diff) | |
| download | tgif-20b3bc155864730380e8186f7d71ee2196a79603.tar.xz | |
Merge branch 'hn/highlight-sideband-keywords'
Lines that begin with a certain keyword that come over the wire, as
well as lines that consist only of one of these keywords, ought to
be painted in color for easier eyeballing, but the latter was
broken ever since the feature was introduced in 2.19, which has
been corrected.
* hn/highlight-sideband-keywords:
sideband: color lines with keyword only
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions