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

The code path that deals with relative paths in the diff-lib has been cleaned up. * jk/diff-relative-cached-unmerged-more: diff-lib: skip paths outside prefix in oneway_diff() diff-lib: drop stale comment about advancing o->pos