mergetools / vimdiff3on commit Sync with master (90011f5)
   1. "$MERGE_TOOLS_DIR/vimdiff"