[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git mergetool again
From: |
Andrea Crotti |
Subject: |
Re: git mergetool again |
Date: |
Tue, 17 Aug 2010 16:10:30 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.2 (darwin) |
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...