mergetools / vimdiff2on commit Merge branch 'va/fix-git-p4-tests' (1efadd7)
   1. "$MERGE_TOOLS_DIR/vimdiff"