Merge branch 'lt/dirstat'

* lt/dirstat:
  diff --dirstat: saner handling of binary and unmerged files
  Add "--dirstat" for some directory statistics

diff --cc diff.c
Simple merge

diff --cc diff.h
Simple merge