mergetools / gvimdiffon commit Merge branch 'sg/travis-fixes' (f62b471)
   1. "$MERGE_TOOLS_DIR/vimdiff"