mergetools / gvimdiff2on commit Merge branch 'br/http-init-fix' (6c1d42a)
   1. "$MERGE_TOOLS_DIR/vimdiff"