From: "Rémi Vanicat" <vanicat@debian.org>
To: git@vger.kernel.org
Subject: Re: emacs as mergetool
Date: Mon, 26 Sep 2011 19:28:58 +0200 [thread overview]
Message-ID: <87ty7zjjqd.dlv@debian.org> (raw)
In-Reply-To: 201109261821.28382.thomas@koch.ro
Thomas Koch <thomas@koch.ro> writes:
> Hi,
>
> would you be so kind and give an emacs newbie (and vim refugee) a hint about
> using emacs as mergetool?
In fact, I use magit like that: after the merge, if there was a
conflict, I launch magit (M-x magit) and go on the unmerged file, then I
use "e" (magit-ediff) to merge them. ediff merge tool is self
documented, and I never needed more than its documentation.
Of course for this you need to install magit, and you don't really use
Emacs as mergetool...
--
Rémi Vanicat
next prev parent reply other threads:[~2011-09-26 17:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-26 16:21 emacs as mergetool Thomas Koch
2011-09-26 17:28 ` Rémi Vanicat [this message]
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=87ty7zjjqd.dlv@debian.org \
--to=vanicat@debian.org \
--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 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.