merge-one-file: fix broken merges with alternate work trees
[git] / t / t9601 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot