Merge branch 'ho/dirstat-by-file'

* ho/dirstat-by-file:
diff --dirstat-by-file: count changed files, not lines

diff --cc diff.c
Simple merge

diff --cc diff.h
Simple merge