From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thorsten Jolitz <tjolitz@gmail.com>
Subject: Re: [WORG] How to ediff folded Org files?
Date: Thu, 01 Aug 2013 16:44:40 +0200
Message-ID: <87wqo5jwrr.fsf@gmail.com>
References: <87y5cwrnw9.fsf@gmail.com>
	<loom.20130801T011342-572@post.gmane.org>
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 ([2001:4830:134:3::10]:53872)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1V4u7r-0001jV-3d
	for emacs-orgmode@gnu.org; Thu, 01 Aug 2013 10:45:19 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1V4u7j-00032r-Mg
	for emacs-orgmode@gnu.org; Thu, 01 Aug 2013 10:45:10 -0400
Received: from plane.gmane.org ([80.91.229.3]:44583)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1V4u7j-0002yF-Fq
	for emacs-orgmode@gnu.org; Thu, 01 Aug 2013 10:45:03 -0400
Received: from list by plane.gmane.org with local (Exim 4.69)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1V4u7a-0007eO-VT
	for emacs-orgmode@gnu.org; Thu, 01 Aug 2013 16:44:54 +0200
Received: from g231109215.adsl.alicedsl.de ([92.231.109.215])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Thu, 01 Aug 2013 16:44:54 +0200
Received: from tjolitz by g231109215.adsl.alicedsl.de with local (Gmexim 0.1
	(Debian)) id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Thu, 01 Aug 2013 16:44:54 +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

Ratish Punnoose <ratish@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