merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / git-gui / macosx /
drwxr-xr-x   parent (dest: git-gui; base: b541248467fa47979a34e3f1c5bbe3308fbdc4d1)
-rw-r--r-- 556 AppMain.tcl
-rw-r--r-- 940 Info.plist
-rw-r--r-- 28866 git-gui.icns