merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / git-gui / windows /
drwxr-xr-x   ..
-rw-r--r-- 687 git-gui.sh