mergetools / gvimdiff2on commit Merge branch 'ls/travis-relays-for-windows-ci' (dcad9a4)
   1. "$MERGE_TOOLS_DIR/vimdiff"