emacs-orgmode
[Top][All Lists]
Advanced

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

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


From: Thorsten Jolitz
Subject: [O] [WORG] How to ediff folded Org files?
Date: Sat, 06 Apr 2013 11:47:50 +0200
User-agent: Gnus/5.130002 (Ma Gnus v0.2) Emacs/24.3 (gnu/linux)

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?

-- 
cheers,
Thorsten





reply via email to

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