mergetools / vimdiff2on commit Merge branch 'bc/log-decoration' into maint (d11ade7)
   1. "$MERGE_TOOLS_DIR/vimdiff"