Merge branch 'sb/range-diff-colors'
commit30035d1d60053e2999041ca14ab607d40206e201
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:54 +0000 (17 13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:54 +0000 (17 13:53 -0700)
tree725ad6c98d93c8e722472dc0200fb4624174694b
parent3ebdef2e1b4c89fd193140b36c04b41eb7f9a86d
parent2543a64187bb80078e493268e683cb0661be754f
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
diff.c
diff.h
t/test-lib-functions.sh