Merge branch 'jk/error-resolve-conflict-advice'
[gitweb.git] / git-gui / macosx /
drwxr-xr-x   parent (dest: git-gui; base: d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7)
-rw-r--r-- 608 AppMain.tcl
-rw-r--r-- 985 Info.plist
-rw-r--r-- 28866 git-gui.icns