* Re: ediff question ...
[not found] <k9q68051e6z.fsf@prism.loc201.tandem.com>
@ 2015-04-30 3:04 ` gnuist006
2015-05-01 1:50 ` Robert Thorpe
0 siblings, 1 reply; 4+ messages in thread
From: gnuist006 @ 2015-04-30 3:04 UTC (permalink / raw)
To: help-gnu-emacs
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.
>
> Thanks in advance for your help.
>
> Regards,
> --jfc
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: ediff question ...
2015-04-30 3:04 ` ediff question gnuist006
@ 2015-05-01 1:50 ` Robert Thorpe
2015-05-01 2:46 ` Stefan Monnier
0 siblings, 1 reply; 4+ messages in thread
From: Robert Thorpe @ 2015-05-01 1:50 UTC (permalink / raw)
To: gnuist006; +Cc: help-gnu-emacs
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: ediff question ...
2015-05-01 1:50 ` Robert Thorpe
@ 2015-05-01 2:46 ` Stefan Monnier
2015-05-01 19:30 ` Robert Thorpe
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Monnier @ 2015-05-01 2:46 UTC (permalink / raw)
To: help-gnu-emacs
> fancy packages like ediff than people are here.
Fancy?
> There's also smerge-mode which is new and introduces some new features.
New?
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: ediff question ...
2015-05-01 2:46 ` Stefan Monnier
@ 2015-05-01 19:30 ` Robert Thorpe
0 siblings, 0 replies; 4+ messages in thread
From: Robert Thorpe @ 2015-05-01 19:30 UTC (permalink / raw)
To: Stefan Monnier; +Cc: help-gnu-emacs
Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> fancy packages like ediff than people are here.
>
> Fancy?
Compared to diff-mode
>> There's also smerge-mode which is new and introduces some new features.
>
> New?
Well, new to me :)
BR,
Robert Thorpe
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-05-01 19:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <k9q68051e6z.fsf@prism.loc201.tandem.com>
2015-04-30 3:04 ` ediff question gnuist006
2015-05-01 1:50 ` Robert Thorpe
2015-05-01 2:46 ` Stefan Monnier
2015-05-01 19:30 ` Robert Thorpe
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.