Merge branch 'jk/add-p-skip-conflicts' into maint
[gitweb.git] / git-gui / macosx /
drwxr-xr-x   parent (dest: git-gui; base: 4579a0547cc558bd0e341adb77897e1f2f331f78)
-rw-r--r-- 556 AppMain.tcl
-rw-r--r-- 940 Info.plist
-rw-r--r-- 28866 git-gui.icns