mergetools / gvimdiff3on commit Merge branch 'rs/mailinfo-qp-decode-fix' (2812ca7)
   1. "$MERGE_TOOLS_DIR/vimdiff"