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: Fri, 13 Aug 2010 22:47:59 +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 1281732597 20807 80.91.229.12 (13 Aug 2010 20:49:57 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 13 Aug 2010 20:49:57 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri Aug 13 22:49:56 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 1Ok1Bz-0003Ep-AQ for geh-help-gnu-emacs@m.gmane.org; Fri, 13 Aug 2010 22:49:53 +0200 Original-Received: from localhost ([127.0.0.1]:55413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ok1BP-00026v-FQ for geh-help-gnu-emacs@m.gmane.org; Fri, 13 Aug 2010 16:48:55 -0400 Original-Received: from [140.186.70.92] (port=59551 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ok1At-00021w-UH for help-gnu-emacs@gnu.org; Fri, 13 Aug 2010 16:48:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ok1Ai-0001QF-Py for help-gnu-emacs@gnu.org; Fri, 13 Aug 2010 16:48:13 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:44908) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ok1Ai-0001Pv-Ff for help-gnu-emacs@gnu.org; Fri, 13 Aug 2010 16:48:12 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Ok1Ae-0002mS-Pz for help-gnu-emacs@gnu.org; Fri, 13 Aug 2010 22:48:08 +0200 Original-Received: from xdsl-89-0-8-40.netcologne.de ([89.0.8.40]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 13 Aug 2010 22:48:08 +0200 Original-Received: from andrea.crotti.0 by xdsl-89-0-8-40.netcologne.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 13 Aug 2010 22:48:08 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 17 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: xdsl-89-0-8-40.netcologne.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (darwin) Cancel-Lock: sha1:UvhmCssgdWGw6HS8vmkWduN/n1U= 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:74628 Archived-At: Andrea Crotti writes: > > I didn't in the easiest place, what process is started by git, and here > the command (I added the -Q) > > cmd =Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $MERGED $REMOTE > > it's already much better, but I would like to use emacsclient instead, > still not working there though :( Sorry wrong command --8<---------------cut here---------------start------------->8--- cmd = Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $REMOTE $MERGED --8<---------------cut here---------------end--------------->8--- Hope it's useful for someone else that wants emerge as the merge tool..