help-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Automatic Ediff-session upon opening file conflicted by a version contro


From: Nordlöw
Subject: Automatic Ediff-session upon opening file conflicted by a version control update-conflict
Date: Mon, 12 Nov 2007 09:40:35 -0000
User-agent: G2/1.0

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öw



reply via email to

[Prev in Thread] Current Thread [Next in Thread]