emacs-orgmode
[Top][All Lists]
Advanced

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

Re: [O] [WORG] How to ediff folded Org files?


From: Marc-Oliver Ihm
Subject: Re: [O] [WORG] How to ediff folded Org files?
Date: Sat, 06 Apr 2013 22:20:54 +0200
User-agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:17.0) Gecko/20130328 Thunderbird/17.0.5

Hi,

if I need to ediff two org-files, I just switch their buffers back to 
fundamental mode temporarily.
Not elegant, but works.

regards, Marc


Am 06.04.2013 11:47, schrieb Thorsten Jolitz:

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?

PS
I don't recieve any new messages from my gmane groups any more since
yesterday - am I the only one?





reply via email to

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