mergetools / vimdiff3on commit Merge branch 'jt/http-auth-proto-v2-fix' (c42c664)
   1. "$MERGE_TOOLS_DIR/vimdiff"