mergetools / vimdiff3on commit Sync with master (499d7c4)
   1. "$MERGE_TOOLS_DIR/vimdiff"