merge-recursive: new function for better colliding conflict resolutions
[gitweb.git] / git-gui / macosx /
drwxr-xr-x   parent (dest: git-gui; base: 37b65ce36bc8f79b5e8cf6f3addf586bd72f3352)
-rw-r--r-- 706 AppMain.tcl
-rw-r--r-- 985 Info.plist
-rw-r--r-- 28866 git-gui.icns