merge-recursive: Improve handling of rename target vs. directory addition
[git] / git-gui / windows /
drwxr-xr-x   ..
-rw-r--r-- 687 git-gui.sh