Merge branch 'jc/numstat'

* jc/numstat:
  diff --numstat: show binary with '-' to match "apply --numstat"

diff --cc diff.c
Simple merge