merge-recursive: don't segfault while handling rename clashes
[git] / git-gui / windows /
drwxr-xr-x   ..
-rw-r--r-- 483 git-gui.sh