Merge branch 'en/merge-fixes'

"merge-recursive" strategy incorrectly checked if a path that is involved in its internal merge exists in the working tree. * en/merge-fixes: merge-recursive: do not check working copy when creating a virtual merge base merge-recursive: remove duplicate code