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

* jk/diff-relative-cached-unmerged: diff-lib: add idx/tree sanity check to oneway_diff diff: ignore unmerged paths outside prefix with --relative --cached