From: jpkotta <jpkotta@gmail.com>
To: help-gnu-emacs@gnu.org
Subject: Re: git mergetool again
Date: Tue, 17 Aug 2010 14:26:57 -0700 (PDT) [thread overview]
Message-ID: <1f4611d8-2b3c-4e95-b9aa-298b12624fb9@j18g2000yqd.googlegroups.com> (raw)
In-Reply-To: 87zkwltgu0.fsf@lola.goethe.zz
On Aug 17, 10:11 am, David Kastrup <d...@gnu.org> wrote:
> Andrea Crotti <andrea.crott...@gmail.com> writes:
> > Andrea Crotti <andrea.crott...@gmail.com> writes:
> >> Sorry wrong command
> >> cmd = Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $REMOTE $MERGED
>
> >> Hope it's useful for someone else that wants emerge as the merge tool..
>
> > I don't get what's wrong with this line
> > cmd = /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -c -e '(emerge-files-with-ancestor-command (getenv "LOCAL") (getenv "MERGED") (getenv "REMOTE"))'
>
> > instead of
> > # cmd = Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $REMOTE $MERGED
>
> > should not that be the same thing?
>
> Huh? Why should it? emerge-files-with-ancestor-command does not take
> arguments.
>
> --
> David Kastrup
I use Mercurial, but the merge tool config is basically the same. See
http://mercurial.selenic.com/wiki/MergingWithEmacs for some
solutions. I used to use the script there, now I use what would be
the equivalent of 'emacs --eval "(ediff-merge-with-ancestor \"$local\"
\"$other\" \"$base\" nil \"$output\")"'
next prev parent reply other threads:[~2010-08-17 21:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-13 19:24 git mergetool again Andrea Crotti
2010-08-13 19:43 ` Andrea Crotti
2010-08-13 20:47 ` Andrea Crotti
2010-08-17 14:10 ` Andrea Crotti
[not found] ` <mailman.7.1282054253.30498.help-gnu-emacs@gnu.org>
2010-08-17 15:11 ` David Kastrup
2010-08-17 21:26 ` jpkotta [this message]
[not found] <mailman.13.1281727462.3281.help-gnu-emacs@gnu.org>
2010-08-13 20:00 ` David Kastrup
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=1f4611d8-2b3c-4e95-b9aa-298b12624fb9@j18g2000yqd.googlegroups.com \
--to=jpkotta@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.