merge-file: correctly open files when in a subdir
[git] / t / t1013 /
drwxr-xr-x   ..
drwxr-xr-x - objects