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