From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marc-Oliver Ihm <marc@ihm.name>
Subject: Re: [WORG] How to ediff folded Org files?
Date: Sat, 06 Apr 2013 22:20:54 +0200
Message-ID: <516083A6.9090305@ihm.name>
References: <87y5cwrnw9.fsf@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:35406)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <marc@ihm.name>) id 1UOZbi-0000ZP-LQ
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 16:21:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <marc@ihm.name>) id 1UOZbe-0006bi-28
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 16:21:02 -0400
Received: from smtp01.udag.de ([62.146.106.17]:33624)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <marc@ihm.name>) id 1UOZbd-0006bL-QL
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 16:20:57 -0400
In-Reply-To: <87y5cwrnw9.fsf@gmail.com>
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: Thorsten Jolitz <tjolitz@gmail.com>, emacs-orgmode@gnu.org

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?
>