mergetools / gvimdiff2on commit diff-highlight: ignore test cruft (9f76e52)
   1. "$MERGE_TOOLS_DIR/vimdiff"