From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thorsten Jolitz <tjolitz@gmail.com>
Subject: [WORG] How to ediff folded Org files?
Date: Sat, 06 Apr 2013 11:47:50 +0200
Message-ID: <87y5cwrnw9.fsf@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:38770)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1UOYUf-000892-MM
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 15:09:52 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1UOYUY-00044d-EE
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 15:09:41 -0400
Received: from plane.gmane.org ([80.91.229.3]:52259)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1UOYUY-00044I-79
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 15:09:34 -0400
Received: from list by plane.gmane.org with local (Exim 4.69)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1UOYCn-0000c2-IO
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 20:51:13 +0200
Received: from e178059134.adsl.alicedsl.de ([85.178.59.134])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Sat, 06 Apr 2013 20:51:13 +0200
Received: from tjolitz by e178059134.adsl.alicedsl.de with local (Gmexim 0.1
	(Debian)) id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Sat, 06 Apr 2013 20:51:13 +0200
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org


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