git-merge-recursive: learn to honor merge.conflictstyle
[git] / git-gui / windows /
drwxr-xr-x   ..
-rw-r--r-- 483 git-gui.sh