From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andrea Crotti Newsgroups: gmane.emacs.help Subject: Re: git mergetool again Date: Tue, 17 Aug 2010 16:10:30 +0200 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1282054288 2248 80.91.229.12 (17 Aug 2010 14:11:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 17 Aug 2010 14:11:28 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Tue Aug 17 16:11:26 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 1OlMsv-0000cv-60 for geh-help-gnu-emacs@m.gmane.org; Tue, 17 Aug 2010 16:11:25 +0200 Original-Received: from localhost ([127.0.0.1]:47298 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OlMsu-00016Q-HT for geh-help-gnu-emacs@m.gmane.org; Tue, 17 Aug 2010 10:11:24 -0400 Original-Received: from [140.186.70.92] (port=44469 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OlMsM-00016C-Jb for help-gnu-emacs@gnu.org; Tue, 17 Aug 2010 10:10:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OlMsI-00029v-KV for help-gnu-emacs@gnu.org; Tue, 17 Aug 2010 10:10:50 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:45792) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OlMsI-00029f-FH for help-gnu-emacs@gnu.org; Tue, 17 Aug 2010 10:10:46 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OlMsE-0000Bb-D8 for help-gnu-emacs@gnu.org; Tue, 17 Aug 2010 16:10:42 +0200 Original-Received: from xdsl-89-0-27-95.netcologne.de ([89.0.27.95]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 17 Aug 2010 16:10:42 +0200 Original-Received: from andrea.crotti.0 by xdsl-89-0-27-95.netcologne.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 17 Aug 2010 16:10:42 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 16 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: xdsl-89-0-27-95.netcologne.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (darwin) Cancel-Lock: sha1:GaO17iZxvwGzcb/J6OpNaGIwjhM= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:74693 Archived-At: 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 --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...