mergetools / gvimdiffon commit merge: handle --ff/--no-ff/--ff-only as a tri-state option (a54841e)
   1. "$MERGE_TOOLS_DIR/vimdiff"