merge-options.txt: clarify meaning of various ff-related options
[git] / git-gui / windows /
drwxr-xr-x   ..
-rwxr-xr-x 687 git-gui.sh