From: Nordlöw <per.nordlow@gmail.com>
To: help-gnu-emacs@gnu.org
Subject: Automatic Ediff-session upon opening file conflicted by a version control update-conflict
Date: Mon, 12 Nov 2007 09:40:35 -0000 [thread overview]
Message-ID: <1194860435.699130.271030@v2g2000hsf.googlegroups.com> (raw)
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
next reply other threads:[~2007-11-12 9:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-12 9:40 Nordlöw [this message]
2007-11-14 15:59 ` Automatic Ediff-session upon opening file conflicted by a version control update-conflict Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1194860435.699130.271030@v2g2000hsf.googlegroups.com \
--to=per.nordlow@gmail.com \
--cc=help-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.