Merge branch 'jk/two-way-merge-corner-case-fix' into maint
[gitweb.git] / git-gui / macosx /
drwxr-xr-x   parent (dest: git-gui; base: 4766036ecdee2d45b5a955409da5e6751c3e2f05)
-rw-r--r-- 608 AppMain.tcl
-rw-r--r-- 940 Info.plist
-rw-r--r-- 28866 git-gui.icns