From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 5 Feb 2019 22:26:17 +0000 (-0800)
Subject: Merge branch 'jk/diff-cc-stat-fixes'
X-Git-Tag: v2.21.0-rc0~36
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5d2710bd3c706c3375991972b630f9419551f24e?ds=inline;hp=--cc

Merge branch 'jk/diff-cc-stat-fixes'

"git diff --color-moved --cc --stat -p" did not work well due to
funny interaction between a bug in color-moved and the rest, which
has been fixed.

* jk/diff-cc-stat-fixes:
combine-diff: treat --dirstat like --stat
combine-diff: treat --summary like --stat
combine-diff: treat --shortstat like --stat
combine-diff: factor out stat-format mask
diff: clear emitted_symbols flag after use
t4006: resurrect commented-out tests
---

5d2710bd3c706c3375991972b630f9419551f24e