mergetools / vimdiff2on commit branch: allow -f with -m and -d (356e91f)
   1. "$MERGE_TOOLS_DIR/vimdiff"