mergetools / gvimdiffon commit Merge branch 'jt/tag-following-with-proto-v2-fix' (d6628c9)
   1. "$MERGE_TOOLS_DIR/vimdiff"