merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / git-gui / windows /
drwxr-xr-x   parent (dest: git-gui; base: b541248)
-rw-r--r-- 483 git-gui.sh