mergetools / gvimdiff2on commit Merge branch 'sb/trailers-docfix' (ae4e3f4)
   1. "$MERGE_TOOLS_DIR/vimdiff"