From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.help Subject: Re: git mergetool again Date: Tue, 17 Aug 2010 17:11:03 +0200 Organization: Organization?!? Message-ID: <87zkwltgu0.fsf@lola.goethe.zz> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1291866987 1809 80.91.229.12 (9 Dec 2010 03:56:27 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 9 Dec 2010 03:56:27 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Thu Dec 09 04:56:23 2010 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PQXcE-0007hq-OU for geh-help-gnu-emacs@m.gmane.org; Thu, 09 Dec 2010 04:56:22 +0100 Original-Received: from localhost ([127.0.0.1]:53306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQXcE-0001Vn-6m for geh-help-gnu-emacs@m.gmane.org; Wed, 08 Dec 2010 22:56:22 -0500 Original-Path: usenet.stanford.edu!news.glorb.com!news2.glorb.com!feeder.erje.net!news.musoftware.de!wum.musoftware.de!news.weisnix.org!newsfeed.ision.net!newsfeed2.easynews.net!ision!newsfeed.arcor.de!newsspool4.arcor-online.net!news.arcor.de.POSTED!not-for-mail Original-Newsgroups: gnu.emacs.help X-Face: 2FEFf>]>q>2iw=B6, xrUubRI>pR&Ml9=ao@P@i)L:\urd*t9M~y1^:+Y]'C0~{mAl`oQuAl \!3KEIp?*w`|bL5qr,H)LFO6Q=qx~iH4DN; i"; /yuIsqbLLCh/!U#X[S~(5eZ41to5f%E@'ELIi$t^ Vc\LWP@J5p^rst0+('>Er0=^1{]M9!p?&:\z]|;&=NP3AhB!B_bi^]Pfkw User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:25h3I8ISpkoXxIR46sWtrWoV3MM= Original-Lines: 21 Original-NNTP-Posting-Date: 17 Aug 2010 17:11:04 CEST Original-NNTP-Posting-Host: 82a1b2e9.newsspool2.arcor-online.net Original-X-Trace: DXC=`8Jn_LDU`]; LNKYb?b>076A9EHlD; 3Yc24Fo<]lROoR18kF5MOK`al0oR:6m`V6=`C6<29?DV>Po; Nj5 Original-X-Complaints-To: usenet-abuse@arcor.de Original-Xref: usenet.stanford.edu gnu.emacs.help:180790 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:76595 Archived-At: Andrea Crotti writes: > Andrea Crotti 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