From: Thomas Koch <thomas@koch.ro>
To: git@vger.kernel.org
Subject: emacs as mergetool
Date: Mon, 26 Sep 2011 18:21:27 +0200 [thread overview]
Message-ID: <201109261821.28382.thomas@koch.ro> (raw)
Hi,
would you be so kind and give an emacs newbie (and vim refugee) a hint about
using emacs as mergetool?
- Which one? ediff vs. emerge (I don't bother learning, just give me the best)
- I'd like to have a setup, where I can run mergetool with different options
to
- connect to a running emacs server
- run emacs in X
- or in the terminal (default)
- Is it possible to resolve all conflicting files in one session instead of
having emacs called again for every file?
- Do you know a tutorial on emacs as a mergetool?
Thank you,
Thomas Koch, http://www.koch.ro
next reply other threads:[~2011-09-26 17:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-26 16:21 Thomas Koch [this message]
2011-09-26 17:28 ` emacs as mergetool Rémi Vanicat
2011-09-28 4:03 ` Vijay Lakshminarayanan
2011-09-28 17:03 ` Nick
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=201109261821.28382.thomas@koch.ro \
--to=thomas@koch.ro \
--cc=git@vger.kernel.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).