mergetools / gvimdiff2on commit t7610: update branch names to match test number (ecfdf0b)
   1. "$MERGE_TOOLS_DIR/vimdiff"