all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Andrea Crotti <andrea.crotti.0@gmail.com>
To: help-gnu-emacs@gnu.org
Subject: Re: git mergetool again
Date: Tue, 17 Aug 2010 16:10:30 +0200	[thread overview]
Message-ID: <m1sk2d49ex.fsf@gmail.com> (raw)
In-Reply-To: m1hbiy8cjk.fsf@gmail.com

Andrea Crotti <andrea.crotti.0@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
--8<---------------cut here---------------start------------->8---
cmd = /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -c -e '(emerge-files-with-ancestor-command (getenv "LOCAL") (getenv "MERGED") (getenv "REMOTE"))'
--8<---------------cut here---------------end--------------->8---

instead of 
        # cmd = Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $REMOTE $MERGED

should not that be the same thing?
But I always get that "local" is a void variable...




  reply	other threads:[~2010-08-17 14:10 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 [this message]
     [not found]     ` <mailman.7.1282054253.30498.help-gnu-emacs@gnu.org>
2010-08-17 15:11       ` David Kastrup
2010-08-17 21:26         ` jpkotta
     [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=m1sk2d49ex.fsf@gmail.com \
    --to=andrea.crotti.0@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.