From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.help Subject: Re: Automatic Ediff-session upon opening file conflicted by a version control update-conflict Date: Wed, 14 Nov 2007 10:59:28 -0500 Message-ID: References: <1194860435.699130.271030@v2g2000hsf.googlegroups.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1195058488 8659 80.91.229.12 (14 Nov 2007 16:41:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 14 Nov 2007 16:41:28 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Wed Nov 14 17:41:33 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 1IsLIq-0007Rl-T8 for geh-help-gnu-emacs@m.gmane.org; Wed, 14 Nov 2007 17:41:25 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IsLIe-0007u3-DF for geh-help-gnu-emacs@m.gmane.org; Wed, 14 Nov 2007 11:41:12 -0500 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!postnews.google.com!news2.google.com!border1.nntp.dca.giganews.com!nntp.giganews.com!local01.nntp.dca.giganews.com!nntp.umontreal.ca!news.umontreal.ca.POSTED!not-for-mail Original-NNTP-Posting-Date: Wed, 14 Nov 2007 09:59:29 -0600 Original-Newsgroups: gnu.emacs.help User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.50 (gnu/linux) Cancel-Lock: sha1:hSYtPx0OxHTD3TcI9S7nX3pEGNQ= Original-Lines: 27 X-Usenet-Provider: http://www.giganews.com Original-NNTP-Posting-Host: 132.204.27.213 Original-X-Trace: sv3-sg3OpF11iryb6u6Xy5l6tfRdC4IQuwnN4iqVOhQ+qRbSVcKR709qxIl+8bTPNrUI3+GKsrtXTsScaym!SQuAb8fMrRKwCJsdJ58qPsZbJ9H/w63XCyA8+O1mpq/uPMXq6TaRoL16cuPp7KFy5v3F0elxWa/O!cgDRJXmx+yeercWABg== Original-X-Complaints-To: abuse@umontreal.ca X-DMCA-Complaints-To: abuse@umontreal.ca X-Abuse-and-DMCA-Info: Please be sure to forward a copy of ALL headers X-Abuse-and-DMCA-Info: Otherwise we will be unable to process your complaint properly X-Postfilter: 1.3.36 Original-Xref: shelby.stanford.edu gnu.emacs.help:153814 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:49246 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. Normally when you enter a file with diff3 conflict markers you should be able to automatically activate smerge-mode (a minor mode specifically designed for that). Ideally, this already works completely automatically (thanks to VC). If it doesn't, please give us some details (I know it doesn't always work, but I'm not sure in which circumstances it fails, so it'll help me fix it). In case smerge-mode is not automatically activated, you may want to add something like the following to your .emacs: (defun sm-try-smerge () (save-excursion (goto-char (point-min)) (when (re-search-forward "^<<<<<<< " nil t) (smerge-mode 1)))) (when (fboundp 'smerge-mode) (add-hook 'find-file-hooks 'sm-try-smerge t)) Now, once smerge-mode is activated, you can enter ediff with C-c ^ E Stefan