mergetools / gvimdiffon commit Merge branch 'jc/mailinfo-cleanup-fix' (46e915c)
   1. "$MERGE_TOOLS_DIR/vimdiff"