Ratish Punnoose <rat...@gmail.com> writes: > Thorsten Jolitz <tjolitz <at> gmail.com> writes: > >> Hi List, >> >> many files on Worg have this startup option: >> >> ,-------------------------- >> | +STARTUP: ... fold ... >> `-------------------------- >> >> what leads to trouble when there is a merge-conflict in (Ma)git to be >> resolved manually with e(diff), because the different versions of the >> Org-file are then presented in folded state in the ediff session, so the >> diffs are invisible. >> >> But when I call 'show-all' or so on them, it breaks the ediff session. >> Is there a simple trick to avoid this problem? > > I was searching for a similar issue and came upon this list. I have a > slightly different solution from the ones posted so far.
[...] Thanks for sharing, I will try this out next time I need to use ediff on Org files. -- cheers, Thorsten
