From: Thorsten Jolitz <tjolitz@gmail.com>
To: emacs-orgmode@gnu.org
Subject: [WORG] How to ediff folded Org files?
Date: Sat, 06 Apr 2013 11:47:50 +0200 [thread overview]
Message-ID: <87y5cwrnw9.fsf@gmail.com> (raw)
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
next reply other threads:[~2013-04-06 19:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-06 9:47 Thorsten Jolitz [this message]
2013-04-06 20:20 ` [WORG] How to ediff folded Org files? Marc-Oliver Ihm
2013-04-06 21:32 ` Thorsten Jolitz
2013-04-06 22:24 ` Michael Brand
2013-04-06 22:40 ` Thorsten Jolitz
2013-04-06 23:01 ` Bill White
2013-04-09 7:29 ` Christian Egli
2013-12-19 19:00 ` Michael Brand
2013-07-31 23:19 ` Ratish Punnoose
2013-08-01 14:44 ` Thorsten Jolitz
2013-08-01 15:09 ` Rémi Vanicat
2013-08-02 12:22 ` Suvayu Ali
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y5cwrnw9.fsf@gmail.com \
--to=tjolitz@gmail.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).