[O] Resolving conflicts with ediff and folding

Hi, Something that has been bugging me for many years now, everytime I resolve conflicts in Org files with ediff, it's a pain. All the buffers keep folding the outlines, hiding the conflicts. I keep going to the buffers manually (which can be somewhat of a pain in a text terminal), and unfolding

Re: [O] Resolving conflicts with ediff and folding

On Tue, 21 Apr 2015, Suvayu Ali wrote: Hi, Something that has been bugging me for many years now, everytime I resolve conflicts in Org files with ediff, it's a pain. All the buffers keep folding the outlines, hiding the conflicts. I keep going to the buffers manually (which can be somewhat of

Re: [O] Resolving conflicts with ediff and folding

"Charles C. Berry" writes: > On Tue, 21 Apr 2015, Suvayu Ali wrote: > >> Hi, >> >> Something that has been bugging me for many years now, everytime I >> resolve conflicts in Org files with ediff, it's a pain. All the buffers >> keep folding the outlines, hiding the conflicts. I keep going to th

Re: [O] Resolving conflicts with ediff and folding

J. David Boyd wrote: > "Charles C. Berry" writes: >> On Tue, 21 Apr 2015, Suvayu Ali wrote: >>> >>> Something that has been bugging me for many years now, everytime >>> I resolve conflicts in Org files with ediff, it's a pain. All the >>> buffers keep folding the outlines, hiding the conflicts.

Re: [O] Resolving conflicts with ediff and folding

I have the following lisp code can do the trick: (add-hook 'ediff-quit-hook (lambda () (cond ((eq major-mode 'org-mode) (visible-mode 0) -- Tian Qiu On Tue, Apr 28, 2015 at 5:43 PM Sebastien Vauban wrote: > J. David Boyd wrote: > > "Charles C. Berry"