From: Robert Thorpe <rt@robertthorpeconsulting.com>
To: gnuist006@gmail.com
Cc: help-gnu-emacs@gnu.org
Subject: Re: ediff question ...
Date: Fri, 01 May 2015 02:50:05 +0100 [thread overview]
Message-ID: <87383hawxe.fsf@robertthorpeconsulting.com> (raw)
In-Reply-To: <941933b6-ea7a-44a9-9f52-91f8a8665ff8@googlegroups.com> (gnuist006@gmail.com)
gnuist006@gmail.com writes:
> Hi, Can anyone reply and explain what Cano Jonathan askd in 1997 ... ?
>
> On Thursday, February 6, 1997 at 12:00:00 AM UTC-8, cano_jonathan wrote:
>>
>> I'm using ediff to merge some files. I've been reading through the
>> ediff documentation and I can't figure out how to do the following:
>>
>> I want to be able to jump the the next (or previous) diff that meets
>> the following criteria:
>>
>> 1) the prefered revision is buffer A
>>
>> or
>>
>> 2) there is a revision A/B conflict.
>>
>> I read *ediff info* on "selective browsing" but I don't understand how
>> to use the #f or #h mechanism to achieve the objective I've described
>> above.
I have no idea. I use diff-mode, not ediff. It seems that regular
help-gnu-emacs readers don't know either.
Try asking at http://emacs.reddit.com/ the folks there are more into
fancy packages like ediff than people are here.
There's also smerge-mode which is new and introduces some new features.
I haven't tried it, but it may be useful for what you want.
BR,
Robert Thorpe
next prev parent reply other threads:[~2015-05-01 1:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <k9q68051e6z.fsf@prism.loc201.tandem.com>
2015-04-30 3:04 ` ediff question gnuist006
2015-05-01 1:50 ` Robert Thorpe [this message]
2015-05-01 2:46 ` Stefan Monnier
2015-05-01 19:30 ` Robert Thorpe
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87383hawxe.fsf@robertthorpeconsulting.com \
--to=rt@robertthorpeconsulting.com \
--cc=gnuist006@gmail.com \
--cc=help-gnu-emacs@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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.