mergetools / vimdiff3on commit diff-parseopt: convert -O (f731814)
   1. "$MERGE_TOOLS_DIR/vimdiff"