merge-recursive: check for directory level conflicts
[gitweb.git] / git-gui / windows /
drwxr-xr-x   parent (dest: git-gui; base: 96e7ffbdc31d9e02e2548df5d9a9701e5a83651d)
-rwxr-xr-x 687 git-gui.sh