Merge branch 'jk/diff-relative-cached-unmerged' into next

'git diff --relative' running with '--cached' has been corrected to
avoid a segfault when encountering unmerged paths outside the
prefix.

* jk/diff-relative-cached-unmerged:
  diff: ignore unmerged paths outside prefix with --relative --cached

diff --cc diff-lib.c
Simple merge