Merge branch 'ab/merge-file-prefix' into maint

"git merge-file" did not work correctly in a subdirectory. * ab/merge-file-prefix: merge-file: correctly open files when in a subdir