Merge branch 'rs/xdiff-wo-the-repository'

Reduce dependency on the_repository of xdiff-interface layer.

* rs/xdiff-wo-the-repository:
  xdiff-interface: stop using the_repository

diff --cc apply.c
Simple merge

diff --cc builtin/merge-file.c
Simple merge

diff --cc merge-ort.c
Simple merge

diff --cc notes-merge.c
Simple merge