xdiff-merge: optionally show conflicts in "diff3 -m" style
[git] / git-gui / macosx /
drwxr-xr-x   ..
-rw-r--r-- 556 AppMain.tcl
-rw-r--r-- 940 Info.plist
-rw-r--r-- 28866 git-gui.icns