merge-one-file: fix broken merges with alternate work trees
[git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 1889 git-new-workdir