merge-one-file: fix broken merges with alternate work trees
[git] / git-gui / windows /
drwxr-xr-x   ..
-rw-r--r-- 633 git-gui.sh