mergetools / vimdiff3on commit Merge branch 'km/imap-send-libcurl-options' into maint (84a37fa)
   1. "$MERGE_TOOLS_DIR/vimdiff"