mergetools / vimdiff3on commit Sync with v2.0.3 (996b0fd)
   1. "$MERGE_TOOLS_DIR/vimdiff"