From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Heerdegen Newsgroups: gmane.emacs.help Subject: Re: Looking for a helper for advanced conflicts resolution. Date: Sat, 25 Jul 2020 00:29:23 +0200 Message-ID: <87h7tweed8.fsf@web.de> References: <878sf9tbmt.fsf@osv.gnss.ru> <87blk4g9rh.fsf@web.de> <87imeclqyz.fsf@osv.gnss.ru> <871rl0g0dm.fsf@web.de> <87a6zolma9.fsf@osv.gnss.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23362"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: help-gnu-emacs@gnu.org To: Sergey Organov Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jul 25 00:31:29 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 1jz6Dx-000606-51 for geh-help-gnu-emacs@m.gmane-mx.org; Sat, 25 Jul 2020 00:31:29 +0200 Original-Received: from localhost ([::1]:51314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz6Dw-00023O-1C for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 18:31:28 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz6C1-000231-BS for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 18:29:29 -0400 Original-Received: from mout.web.de ([212.227.15.4]:49389) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz6By-0001MN-NY for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 18:29:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1595629764; bh=tQ1dTDvDMwUJ48gFUrug4XS5ImN5WIqTpSAjZadMvGg=; h=X-UI-Sender-Class:From:To:Cc:Subject:References:Date:In-Reply-To; b=eijaMoNzW206bTpkRC/uXmrTVvUgyed9mVmgQPUTLjvLumXbWzmAbdwvX5a5wSHcD rP5K/Zo7aGnP9Q7uIXO1YNwrCVnD5oOFNrgNp/QSlTcWZ4yLVk1KEToV+T9mh35HVd ZuR8AGCCF4GmAYRDHL1Vb1AyCA5iBzIc4Kqo3gPk= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Original-Received: from drachen.dragon ([92.76.215.78]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MCogm-1k7rdM1bpw-008tkp; Sat, 25 Jul 2020 00:29:24 +0200 In-Reply-To: <87a6zolma9.fsf@osv.gnss.ru> (Sergey Organov's message of "Fri, 24 Jul 2020 22:56:30 +0300") X-Provags-ID: V03:K1:ADwFB5Vl9E9zFVLN99LzZbpwv8jz5oD03PjkwpYtBnKcLR80THP j2xXjC7uENty7htpM7PnKl8k/gI7Uq5oNEd0j6/uLbk1LKQ7gSja/3EsZOpXFmCMZAm1TGZ iO3RME5capT7vdK79/hnycPjDpUeJepCNFmudINEvG6TrXOTxA4q+14+C13jBbphUOlmUBW bqTXZdvK6fbpHY4gqxx3A== X-UI-Out-Filterresults: notjunk:1;V03:K0:Hn7/K8LQBYA=:JLd/n1GSkKpy927FA8YhzD HCe8SAL/U0Iy7aS0FJ9WFotKHEuV9nK+C35HQaFgYLHWJe6tyqAGFXY2Nw8OkGir16lDHyxjR LaEPBTLNQRl5dHIE3UjUE2tvF+hlHyZnWBoOEvYkQWa1Q4dj2aiOhgoHMvaJuqhyfaiueOuts 4hLn3JQs1Nkgp6k8ERpikrTv0jy9Zhvbb+4o7mZTZ59MVjk8J1iypdHGVGaxmZZ3n5XnRpa+Y 3fsVUWV6pjtNAjGD3jECp/sKU4GBnZTshthVTB95y/D7+Z3fsq9Oz+TeKAjRC3BKxEUnK58eo U858AC7LIbVKrgV5BrTM1CwrT6z0eRZPyy/9n4SDtdf1ydafXVu3Na6JckLFajIUGNvV6ISNq E0QbFJ/h7+AXkj3JWNzwl7ZXEDmi6ye4CCERRI+BJvPSKey6mZ1s/toWWrMuuAjiMWZNoCzA+ B9aqfymC6kmDOgPNfprnZ92sQ4lohg+4PjlZIhNJdGdaQyCiQViV6hHtJ9Qu0ChNWglAoP4rs T8l15FszhI7rsaAJKTQzUGNXvNh2kv4b9HAt1UFuPG+E/lPmyqSY8ulNNc0T1D78X0TU9O8Vl qdGtqbvvNRgHvS8xklFw3aJRgZqztOb/Jrk5n/VuTWxwdUV4rsvbu4LtQCiF2sa6wp/i/a1cZ 06/slqTiiEE7NEVR9r2puKXKh8IgAym4Kw4fqiNTARquIpsYxh2Zui4D/XJJibTr7btPsM8s/ zsyQI/uvHqszd5HaR5Qqakovad2IYOt8VYbjYCElOyYB/8NMnG/Mcju+Z0290wXrCpEkB5W4 Received-SPF: pass client-ip=212.227.15.4; envelope-from=michael_heerdegen@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 18:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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:123587 Archived-At: Sergey Organov writes: > > I did implement that but haven't yet packaged it. > > Thanks for letting know it's coming! Exactly as it should be for > Swiss-army knife of merging and diffing. Don't expect that it appears soon, however. I can send something privately all the time. But I don't like how Ediff is coded, and it's not fun for me to hack it and provide something "official". But if I can't make it in this life, then ehm... what came after that again? Michael.