merge-one-file: fix broken merges with alternate work trees
[git] / t / t9136 /
drwxr-xr-x   ..
-rw-r--r-- 2221 svn.dump