Merge branch 'sb/range-diff-colors'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:54 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:54 +0000 (13:53 -0700)
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

1  2 
diff.c
diff.h
t/test-lib-functions.sh
diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge
Simple merge