git-merge-recursive: learn to honor merge.conflictstyle
[gitweb.git] / git-gui / macosx /
drwxr-xr-x   parent (dest: git-gui; base: c236bcd06138bcbc929b86ad1a513635bf4847b2)
-rw-r--r-- 556 AppMain.tcl
-rw-r--r-- 940 Info.plist
-rw-r--r-- 28866 git-gui.icns