help-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: git mergetool again


From: David Kastrup
Subject: Re: git mergetool again
Date: Wed, 08 Dec 2010 15:25:19 -0000
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

Andrea Crotti <andrea.crotti.0@gmail.com> writes:

> 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
> 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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]