From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?iso-8859-1?B?Tm9yZGz2dw==?= Newsgroups: gmane.emacs.help Subject: Automatic Ediff-session upon opening file conflicted by a version control update-conflict Date: Mon, 12 Nov 2007 09:40:35 -0000 Organization: http://groups.google.com Message-ID: <1194860435.699130.271030@v2g2000hsf.googlegroups.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1194860544 9910 80.91.229.12 (12 Nov 2007 09:42:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 12 Nov 2007 09:42:24 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Mon Nov 12 10:42:29 2007 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IrVoH-0008NQ-PE for geh-help-gnu-emacs@m.gmane.org; Mon, 12 Nov 2007 10:42:25 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IrVo5-0002Du-Ry for geh-help-gnu-emacs@m.gmane.org; Mon, 12 Nov 2007 04:42:13 -0500 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!postnews.google.com!v2g2000hsf.googlegroups.com!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 8 Original-NNTP-Posting-Host: 150.227.15.253 Original-X-Trace: posting.google.com 1194860435 26246 127.0.0.1 (12 Nov 2007 09:40:35 GMT) Original-X-Complaints-To: groups-abuse@google.com Original-NNTP-Posting-Date: Mon, 12 Nov 2007 09:40:35 +0000 (UTC) User-Agent: G2/1.0 X-HTTP-UserAgent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.7) Gecko/20070923 Firefox/2.0.0.7 (Swiftfox),gzip(gfe),gzip(gfe) X-HTTP-Via: 1.1 netcache (NetCache NetApp/6.1.1RC1) Complaints-To: groups-abuse@google.com Injection-Info: v2g2000hsf.googlegroups.com; posting-host=150.227.15.253; posting-account=ps2QrAMAAAA6_jCuRt2JEIpn5Otqf_w0 Original-Xref: shelby.stanford.edu gnu.emacs.help:153694 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:49151 Archived-At: How can I make ediff automatically parse the conflicts tags ( <<<< File A, >>>> File B, ... ) and enter into an ediff merge-2 or merge-3 session when I open a file that has been conflicted by an cvs,svn,.. update. File opening can be either direct or through a svn/cvs/git- status buffer. /Nordl=F6w