From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: John Yates Newsgroups: gmane.emacs.help Subject: Re: Looking for a helper for advanced conflicts resolution. Date: Sat, 25 Jul 2020 07:37:37 -0400 Message-ID: References: <878sf9tbmt.fsf@osv.gnss.ru> <87blk4g9rh.fsf@web.de> <87imeclqyz.fsf@osv.gnss.ru> <871rl0g0dm.fsf@web.de> <87a6zolma9.fsf@osv.gnss.ru> <87h7tweed8.fsf@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2333"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Help Gnu Emacs mailing list , Sergey Organov To: Michael Heerdegen Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jul 25 13:38:39 2020 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jzIVi-0000WI-NV for geh-help-gnu-emacs@m.gmane-mx.org; Sat, 25 Jul 2020 13:38:38 +0200 Original-Received: from localhost ([::1]:32986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzIVh-0006MP-Ld for geh-help-gnu-emacs@m.gmane-mx.org; Sat, 25 Jul 2020 07:38:37 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzIUz-0006MB-A3 for help-gnu-emacs@gnu.org; Sat, 25 Jul 2020 07:37:53 -0400 Original-Received: from mail-lj1-f175.google.com ([209.85.208.175]:34255) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jzIUx-0004TU-TA for help-gnu-emacs@gnu.org; Sat, 25 Jul 2020 07:37:53 -0400 Original-Received: by mail-lj1-f175.google.com with SMTP id q7so12539601ljm.1 for ; Sat, 25 Jul 2020 04:37:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=64oBjQ+e2Lsh21AynawCVdglgM2T3sQqHeiNs5DZRoU=; b=LiHtCA3byBrx0lzh1+qqDL57NupkoiLvKkV3wWMj/6/ers1hCN0zHOfs7wZ5EZq70x iJGO9lhOKwwOtaPPeOp+35s9ABnhj/H/ApHi9a/7xRAzmC0y9b2fNFpVwl810slQGOn3 xWtKPE90zti1RzUh/8R/9AFYa+ZEBEKkTwQe6ORLNPRM2kQ71h+bn8grn2yf9hAOENGE l5ryg4V5jJygAq4S56Ah9Owyb21T4ZTAa3uOj/9hk3ux+wLNXLU9t3EUsfWlNFD4HRWg SOBjzs33MLF9fxl4xpkzViUP3MX7tG53eCEXIUw8nY7pGn/zTQxJFGHp33175aG4SDBF B3MA== X-Gm-Message-State: AOAM532xRcPIkU300x2QtF9fx/yWt6dfDp6Z2Yebbcl4iXORVSAO6mg8 nFLkYejKZYf7fFHkUmjSekZptiYgcfidLVuxF1E= X-Google-Smtp-Source: ABdhPJxkg7tKmUzu9vvVf2lqDgIIlGWDbT8R51iVm7dxb2+YqfNQ8i3h60X6tRV3dfSBeJy/q+UysIAqvGuE10gQnzM= X-Received: by 2002:a2e:9957:: with SMTP id r23mr6414492ljj.127.1595677069390; Sat, 25 Jul 2020 04:37:49 -0700 (PDT) In-Reply-To: <87h7tweed8.fsf@web.de> Received-SPF: pass client-ip=209.85.208.175; envelope-from=john.yates.sheets@gmail.com; helo=mail-lj1-f175.google.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/25 07:37:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "help-gnu-emacs" Xref: news.gmane.io gmane.emacs.help:123588 Archived-At: On Fri, Jul 24, 2020 at 6:29 PM Michael Heerdegen wrote: > > But I don't like how Ediff is coded +1 /john