mergetools / vimdiff2on commit Merge branch 'cc/trailers-corner-case-fix' (483c9b8)
   1. "$MERGE_TOOLS_DIR/vimdiff"