mergetools / gvimdiff2on commit Merge branch 'sg/travis-build-during-script-phase' into next (29e1585)
   1. "$MERGE_TOOLS_DIR/vimdiff"