From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2018 20:53:54 +0000 (-0700)
Subject: Merge branch 'sb/range-diff-colors'
X-Git-Tag: v2.20.0-rc0~243
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30035d1d60053e2999041ca14ab607d40206e201;p=thirdparty%2Fgit.git

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
---

30035d1d60053e2999041ca14ab607d40206e201