mergetools / gvimdiff2on commit Merge branch 'ab/send-email-transferencoding-fix' (86d2271)
   1. "$MERGE_TOOLS_DIR/vimdiff"