mergetools / gvimdiff2on commit Merge branch 'jk/url-insteadof-config' (ec8455e)
   1. "$MERGE_TOOLS_DIR/vimdiff"