From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Christoph Groth Newsgroups: gmane.emacs.devel Subject: Idea: change default ediff-combination-pattern to be compatible with smerge-mode Date: Tue, 14 May 2024 17:21:49 +0200 Message-ID: <87zfsso1v6.fsf@drac> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23550"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue May 14 19:15:14 2024 Return-path: Envelope-to: ged-emacs-devel@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 1s6vk9-0005vS-KB for ged-emacs-devel@m.gmane-mx.org; Tue, 14 May 2024 19:15:13 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6vjS-0004oQ-8k; Tue, 14 May 2024 13:14:30 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6tyo-0006EF-4w for emacs-devel@gnu.org; Tue, 14 May 2024 11:22:16 -0400 Original-Received: from dia.uberspace.de ([185.26.156.221]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6tyj-0005pH-B7 for emacs-devel@gnu.org; Tue, 14 May 2024 11:22:12 -0400 Original-Received: (qmail 14009 invoked by uid 989); 14 May 2024 15:21:57 -0000 Authentication-Results: dia.uberspace.de; auth=pass (plain) Original-Received: from unknown (HELO unkown) (::1) by dia.uberspace.de (Haraka/3.0.1) with ESMTPSA; Tue, 14 May 2024 17:21:57 +0200 X-Rspamd-Bar: - X-Rspamd-Report: BAYES_HAM(-1.716923) MID_RHS_NOT_FQDN(0.5) MIME_GOOD(-0.1) X-Rspamd-Score: -1.316923 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=grothesque.org; s=uberspace; h=from:to:subject:date; bh=kTMGKrsTTqpLj+n38MqakjC3dXP75e6OeZ5KiRwLyTY=; b=LvXvz+y/L3Xo6GsH/7f9t0YFlJdxhIEA2w2P+Oe956D1ySg5HJZDgAYEFMu3/x7GXjCqavriD2 JGE142WEgdrMURHusuzjLGfOtCk+lcD9l6yfx6YgwN2qcnFIOcsRSS9FDA64z0aBeGBSe12n9qat OEUQGJrTtk36GZPdlmjzlo25CzLNgmW4EpP2EIq2V5ld8CgReWXJQJJ/OtrbNfpcyEe4HB3i4vwo xyfGATXGC/SKXXq6xsiSY738MitEZhiBcNg5T4QFjJ8p17bPrJMtvoeB5nqwZg4A1ELNYLFQRmGb 7XmGFkfQxZtvqDzrHeRNFB/h3c3q8IVKeKfX18vM5HBCfpI9bXRLd7CgCT4LKF+KHOXCEKt3la8x 7kqpV26Gtdex+nXEDDrqUR1UvaWV8KruXiP7MU549zlE0Dc51rAJdEjQAeMFKzOJkMMV6jYt5ycL rgORXdkM53WKkRAdvXbrdJXXPu1g4AA5+wS362fYx7lcUShQw2vcTs8APg4x2gOx0vJGBRVlZ6wr nHWJHcktWdFV79WyLTihkVKti2kRVB9kQDplGiRIV5rSPK1A8KbJjoMisVgidmLPDpr9cgfHTq2D RnytFXzbChOb6Q8K8+pHzPQTAjYgnagdmE06thwGRkqgDYIf9/8zxb+yIBHbJARB/nIOFxPfIjCQ U= Received-SPF: pass client-ip=185.26.156.221; envelope-from=christoph@grothesque.org; helo=dia.uberspace.de 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 14 May 2024 13:14:28 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:319229 Archived-At: Hello, Is there a reason why ediff=E2=80=99s diff markers (for a 3-way-merge with ancestor) are not compatible with smerge-mode by default? It turns out that smerge-mode works well together with ediff-merge if one sets ediff-combination-pattern to (for example) ("<<<<<<< variant A" A "||||||| ancestor" Ancestor "=3D=3D=3D=3D=3D=3D=3D" B ">>>>>>> variant B") The mode smerge-mode provides smerge-refine, which allows to highlight differences between the ancestor and either variant A or variant B. This functionality does not seem to be available in ediff but can be very useful when resolving conflicts. I know that this is old stuff [1], but perhaps it=E2=80=99s one of those li= ttle things that could be improved with little effort? Cheers Christoph [1] https://gnu.emacs.help.narkive.com/djAhFzov/ediff-merge-ancestor-refine= ment