From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Charles C. Berry" <ccberry@ucsd.edu>
Subject: Re: Resolving conflicts with ediff and folding
Date: Mon, 20 Apr 2015 18:00:10 -0700
Message-ID: <alpine.OSX.2.00.1504201758560.2225@charles-berrys-macbook.local>
References: <20150420232308.GB26502@chitra.no-ip.org>
Mime-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49126)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ccberry@ucsd.edu>) id 1YkMY1-0008Dl-0e
	for emacs-orgmode@gnu.org; Mon, 20 Apr 2015 21:00:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ccberry@ucsd.edu>) id 1YkMXv-0002TX-HN
	for emacs-orgmode@gnu.org; Mon, 20 Apr 2015 21:00:20 -0400
Received: from iport-acv2-out.ucsd.edu ([132.239.0.174]:5846)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ccberry@ucsd.edu>) id 1YkMXv-0002TP-9J
	for emacs-orgmode@gnu.org; Mon, 20 Apr 2015 21:00:15 -0400
In-Reply-To: <20150420232308.GB26502@chitra.no-ip.org>
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: Suvayu Ali <fatkasuvayu+linux@gmail.com>
Cc: Emacs Org mode <emacs-orgmode@gnu.org>

On Tue, 21 Apr 2015, Suvayu Ali wrote:

> Hi,
>
> Something that has been bugging me for many years now, everytime I
> resolve conflicts in Org files with ediff, it's a pain.  All the buffers
> keep folding the outlines, hiding the conflicts.  I keep going to the
> buffers manually (which can be somewhat of a pain in a text terminal),
> and unfolding them manually.  But of course the PROPERTY drawers,
> LOGBOOKs, and other DRAWERs are still folded!
>
> And then after I have jumped through hoops, and resolved the conflicts,
> I realise I could have just switched to text-mode before invoking ediff!
>
> Is there a way where I don't have to remember to switch the major mode
> before invoking ediff[1]?  Or maybe an ediff experience where the
> buffers are forced to unhide text.  I guess it should be possible to
> just temporarily remove all overlays or invisible properties.
>
> Any thoughts, ideas?

Did you see this thread:

http://lists.gnu.org/archive/html/emacs-orgmode/2013-04/msg00400.html

??

HTH,

Chuck