Merge branch 'sg/travis-skip-identical-test'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"