mergetools / gvimdiffon commit Merge branch 'ab/fail-prereqs-in-test' (6af2c75)
   1. "$MERGE_TOOLS_DIR/vimdiff"