mergetools / gvimdiffon commit Merge branch 'rj/highlight-test-hang' (a43948b)
   1. "$MERGE_TOOLS_DIR/vimdiff"