mergetools / gvimdiff2on commit Merge branch 'bc/send-email-qp-cr' (5983ddc)
   1. "$MERGE_TOOLS_DIR/vimdiff"