mergetools / vimdiff2on commit merge-options.txt: clarify meaning of various ff-related options (27fd1e4)
   1. "$MERGE_TOOLS_DIR/vimdiff"