all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Christoph Groth <christoph@grothesque.org>
To: emacs-devel@gnu.org
Subject: Idea: change default ediff-combination-pattern to be compatible with smerge-mode
Date: Tue, 14 May 2024 17:21:49 +0200	[thread overview]
Message-ID: <87zfsso1v6.fsf@drac> (raw)

Hello,

Is there a reason why ediff’s 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
 "======="
 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’s one of those little
things that could be improved with little effort?

Cheers
Christoph

[1] https://gnu.emacs.help.narkive.com/djAhFzov/ediff-merge-ancestor-refinement



                 reply	other threads:[~2024-05-14 15:21 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87zfsso1v6.fsf@drac \
    --to=christoph@grothesque.org \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.