all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Idea: change default ediff-combination-pattern to be compatible with smerge-mode
@ 2024-05-14 15:21 Christoph Groth
  0 siblings, 0 replies; only message in thread
From: Christoph Groth @ 2024-05-14 15:21 UTC (permalink / raw)
  To: emacs-devel

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



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-05-14 15:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-14 15:21 Idea: change default ediff-combination-pattern to be compatible with smerge-mode Christoph Groth

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.