mergetools / gvimdiffon commit Merge branch 'js/imap-send-curl-compilation-fix' (e88e424)
   1. "$MERGE_TOOLS_DIR/vimdiff"