Merge branch 'mk/diff-shortstat-dirstat-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 23:02:28 +0000 (15:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 23:02:29 +0000 (15:02 -0800)
"git diff --shortstat --dirstat=changes" showed a dirstat based on
lines that was never asked by the end user in addition to the
dirstat that the user asked for.

* mk/diff-shortstat-dirstat-fix:
diff --shortstat --dirstat: remove duplicate output

1  2 
diff.c
diff --cc diff.c
Simple merge