summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-09-17 13:53:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-17 13:53:54 -0700
commit30035d1d60053e2999041ca14ab607d40206e201 (patch)
tree725ad6c98d93c8e722472dc0200fb4624174694b /builtin
parentMerge branch 'jk/pack-delta-reuse-with-bitmap' (diff)
parentrange-diff: indent special lines as context (diff)
downloadtgif-30035d1d60053e2999041ca14ab607d40206e201.tar.xz
Merge branch 'sb/range-diff-colors'
The color output support for recently introduced "range-diff" command got tweaked a bit. * sb/range-diff-colors: range-diff: indent special lines as context range-diff: make use of different output indicators diff.c: add --output-indicator-{new, old, context} diff.c: rewrite emit_line_0 more understandably diff.c: omit check for line prefix in emit_line_0 diff: use emit_line_0 once per line diff.c: add set_sign to emit_line_0 diff.c: reorder arguments for emit_line_ws_markup diff.c: simplify caller of emit_line_0 t3206: add color test for range-diff --dual-color test_decode_color: understand FAINT and ITALIC
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions