[O] Resolving conflicts with ediff and folding

[Suvayu Ali]

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 them manually.  But of course the PROPERTY drawers,
LOGBOOKs, and other DRAWERs are still folded!

And then after I have jumped through hoops, and resolved the conflicts,
I realise I could have just switched to text-mode before invoking ediff!

Is there a way where I don't have to remember to switch the major mode
before invoking ediff[1]?  Or maybe an ediff experience where the
buffers are forced to unhide text.  I guess it should be possible to
just temporarily remove all overlays or invisible properties.

Any thoughts, ideas?


Footnotes:

[1] I guess I can advice ediff*, but compiling a comprehensive list of
    all such functions might be bit of a chore.

-- 
Suvayu

Open source is the future. It sets us free.