merge-file: correctly open files when in a subdir
[git] / t / t9700 /
drwxr-xr-x   ..
-rwxr-xr-x 5545 test.pl