Merge branch 'jc/merge-x-theirs-docfix' into maint
[gitweb.git] / git-gui / macosx /
drwxr-xr-x   parent (dest: git-gui; base: 77cdf8c6f9d142a8d9693531d442ffa0712874d6)
-rw-r--r-- 706 AppMain.tcl
-rw-r--r-- 985 Info.plist
-rw-r--r-- 28866 git-gui.icns