mergetools / vimdiff2on commit Merge branch 'rs/mailinfo-qp-decode-fix' into maint (01ae81e)
   1. "$MERGE_TOOLS_DIR/vimdiff"