mergetools / vimdiff2on commit imap-send.c: imap_folder -> imap_server_conf.folder (3918057)
   1. "$MERGE_TOOLS_DIR/vimdiff"