From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Robert Thorpe Newsgroups: gmane.emacs.help Subject: Re: ediff question ... Date: Fri, 01 May 2015 02:50:05 +0100 Message-ID: <87383hawxe.fsf@robertthorpeconsulting.com> References: <941933b6-ea7a-44a9-9f52-91f8a8665ff8@googlegroups.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1430445034 27915 80.91.229.3 (1 May 2015 01:50:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 May 2015 01:50:34 +0000 (UTC) Cc: help-gnu-emacs@gnu.org To: gnuist006@gmail.com Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri May 01 03:50:23 2015 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yo05v-0006bF-5G for geh-help-gnu-emacs@m.gmane.org; Fri, 01 May 2015 03:50:23 +0200 Original-Received: from localhost ([::1]:46464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yo05u-0006f1-Dj for geh-help-gnu-emacs@m.gmane.org; Thu, 30 Apr 2015 21:50:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yo05j-0006eg-0G for help-gnu-emacs@gnu.org; Thu, 30 Apr 2015 21:50:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yo05f-0005Ci-QN for help-gnu-emacs@gnu.org; Thu, 30 Apr 2015 21:50:10 -0400 Original-Received: from outbound-smtp05.blacknight.com ([81.17.249.38]:60246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yo05f-0005B5-Ki for help-gnu-emacs@gnu.org; Thu, 30 Apr 2015 21:50:07 -0400 Original-Received: from mail.blacknight.com (pemlinmail02.blacknight.ie [81.17.254.11]) by outbound-smtp05.blacknight.com (Postfix) with ESMTPS id 1120798D19 for ; Fri, 1 May 2015 01:50:06 +0000 (UTC) Original-Received: (qmail 30299 invoked from network); 1 May 2015 01:50:05 -0000 Original-Received: from unknown (HELO RTLaptop) (rt@robertthorpeconsulting.com@[109.78.201.16]) by 81.17.254.9 with ESMTPSA (DHE-RSA-AES128-SHA encrypted, authenticated); 1 May 2015 01:50:05 -0000 In-Reply-To: <941933b6-ea7a-44a9-9f52-91f8a8665ff8@googlegroups.com> (gnuist006@gmail.com) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 81.17.249.38 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:104118 Archived-At: 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