Merge branch 'rs/external-diff-with-exit-code'

* rs/external-diff-with-exit-code:
  Revert "diff: fix --exit-code with external diff"

diff --cc diff.c
Simple merge

diff --cc t/t4020-diff-external.sh
Simple merge