merge-one-file: fix broken merges with alternate work trees
[git] / t / t9700 /
drwxr-xr-x   ..
-rwxr-xr-x 4627 test.pl