merge-recursive: demonstrate an incorrect conflict with submodule
[gitweb.git] / git-gui / macosx /
drwxr-xr-x   parent (dest: git-gui; base: 7d82b06d2be1b872a1debf79fadf0585afc70b69)
-rw-r--r-- 556 AppMain.tcl
-rw-r--r-- 940 Info.plist
-rw-r--r-- 28866 git-gui.icns