merge-recursive: Nuke rename/directory conflict detection
[git] / git-gui / windows /
drwxr-xr-x   ..
-rw-r--r-- 687 git-gui.sh