merge-recursive: check for directory level conflicts
[gitweb.git] / git-gui / macosx /
drwxr-xr-x   parent (dest: git-gui; base: 96e7ffbdc31d9e02e2548df5d9a9701e5a83651d)
-rw-r--r-- 706 AppMain.tcl
-rw-r--r-- 985 Info.plist
-rw-r--r-- 28866 git-gui.icns