[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: ediff to combine A and B

From: Stefan Monnier
Subject: Re: ediff to combine A and B
Date: Fri, 16 Jan 2015 10:10:49 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux)

> Is there any way how in ediff join the differences of each buffer wrt
> ancestor and apply those on bufferC?

I don't use ediff for that.  Instead I arrange for the conflict to
appear as diff3 markers, so I can use smerge-mode where I can do things
like smerge-keep-all.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]