Merge branch 'mk/diff-shortstat-dirstat-fix'
commitb6488fe191c3bff0dee39cfd2a7082dd52159c47
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 23:02:28 +0000 (6 15:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 23:02:29 +0000 (6 15:02 -0800)
tree53084ec8cdbc7d2d5bb0d9ae5dce23c5359ee122
parent79de649c0f452c0366a7306819f10760f4ed8b92
parentab27389affc78a521fe44fc25518e1d11a4fc433
Merge branch 'mk/diff-shortstat-dirstat-fix'

"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
diff.c