mergetools / gvimdiffon commit Merge branch 'dt/mailinfo' into maint (f7e2e59)
   1. "$MERGE_TOOLS_DIR/vimdiff"