From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sergey Organov Newsgroups: gmane.emacs.help Subject: Re: Looking for a helper for advanced conflicts resolution. Date: Fri, 24 Jul 2020 21:15:16 +0300 Message-ID: <87imeclqyz.fsf@osv.gnss.ru> References: <878sf9tbmt.fsf@osv.gnss.ru> <87blk4g9rh.fsf@web.de> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7603"; 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: Michael Heerdegen Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jul 24 20:15:59 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 1jz2Eg-0001sz-EO for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 20:15:58 +0200 Original-Received: from localhost ([::1]:59580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz2Ef-0004Br-96 for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 14:15:57 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz2E6-0004Bh-9d for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 14:15:22 -0400 Original-Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]:38458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jz2E4-0008LM-R4 for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 14:15:22 -0400 Original-Received: by mail-lf1-x133.google.com with SMTP id 140so5677245lfi.5 for ; Fri, 24 Jul 2020 11:15:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=2ZKoXBML6F4NKHKKkUvyRFgaT+s0kK+8VozaZG6afqg=; b=G4xqSHvAgtNx8gBIfmgsLXcIHXLAKsLtRGzWwfN37HJOaIFAwmEJTVxQrM6Falqwc7 z4LH3AQHMm1BrXSNKXytvSqc0YtyhzPaz6XuJe4TkI/gfOTl/wu8bE82ap9JFxmY/snG oOE4xowwYpjX79yJ4QI88Xl7DcnmlOXDNm1gzslcny5iT3SzjLv5fPerxOEgauAWDRH0 7KeJVIndttG58+HfGFcEL7MenE/tTNvXjo9FobGolIdI4keWLWlFcsp0AKarGklpmXzI /RS0Eqp1UdVVhcYE9TdDMBba0qhmDfLhwvmncaLK53dcXDUiviHKMGQx9iXuu0VxZ5xG DLQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=2ZKoXBML6F4NKHKKkUvyRFgaT+s0kK+8VozaZG6afqg=; b=dgI7nw6et+qugg0QhJQCiV5kAOnURypDBrG1bIG5tEn0TQAUOvNlx8CXebr8bDoeV2 9z18Ejfkm6AuxqvW6GLRWtVpt7d0Qpltmr1IpzmdaFeLMvwJ6a6Dk3NGT9LLu7M6ke+5 1CPZ1+fT9++JusM0oD2LTZCyBsHIEuhz77dyFS8NPGi0gROrLEuImuDbUZ8pmzP2aIZT i9rm4e1xgb21kFFpVUunmBc8nbMTLVU9PL5F8YrJ0h/EiwDrad8Z1HUNgNJKScv/BTtE tB/78dk6hJi+CJ/o5wffd5aVL5oinoCC1QWe5ek8laqD1tGBTebT5MSmMXq7BYpu28iU EbtA== X-Gm-Message-State: AOAM53042SCLP8HbriTvyKD4YrMFf3Gzt/QVPz7FdyKE6/KUR5qK20dG pFuItS1Gf6LVLEfx3kL0TI7oS8zP X-Google-Smtp-Source: ABdhPJxc6C2HJfakrei0Nr3ybxtG1LLsIWL9FydURbmwTDUbZLaZg67H3nGO39SniHf/gGgRoceGqw== X-Received: by 2002:a19:c206:: with SMTP id l6mr5610168lfc.152.1595614518699; Fri, 24 Jul 2020 11:15:18 -0700 (PDT) Original-Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id w5sm403980lji.49.2020.07.24.11.15.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 11:15:17 -0700 (PDT) In-Reply-To: <87blk4g9rh.fsf@web.de> (Michael Heerdegen's message of "Fri, 24 Jul 2020 18:25:54 +0200") Received-SPF: pass client-ip=2a00:1450:4864:20::133; envelope-from=sorganov@gmail.com; helo=mail-lf1-x133.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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:123581 Archived-At: Michael Heerdegen writes: > Sergey Organov writes: > >> Hello, >> >> To aid in resolution of complex conflicts, I'd like to know if there is >> a tool in Emacs that, given diff3-style 3-way conflict output, would >> convert it into 2 simple diffs: "mine" changes from common ancestor, and >> "yours" changes from common ancestor. Does anybody know about one? > > Doesn't "smerge" do that (`smerge-diff-base-upper', > `smerge-diff-base-lower', `smerge-diff-upper-lower')? Dunno, will try it, thanks for pointing! > I'm using Ediff. AFAIR Ediff can't do the analogue out of the box when > merging, but it's not hard to implement. Yeah, that was my first candidate, and I've tried to invoke it from magit, but it doesn't seem indeed to have the feature. Implementing it probably is not a big deal indeed, with or without ediff, I just hope to find something ready. Thanks, -- Sergey