From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: jpkotta Newsgroups: gmane.emacs.help Subject: Re: git mergetool again Date: Tue, 17 Aug 2010 14:26:57 -0700 (PDT) Organization: http://groups.google.com Message-ID: <1f4611d8-2b3c-4e95-b9aa-298b12624fb9@j18g2000yqd.googlegroups.com> References: <87zkwltgu0.fsf@lola.goethe.zz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1291858936 7625 80.91.229.12 (9 Dec 2010 01:42:16 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 9 Dec 2010 01:42:16 +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 02:42:12 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 1PQVWN-0001H5-Gr for geh-help-gnu-emacs@m.gmane.org; Thu, 09 Dec 2010 02:42:11 +0100 Original-Received: from localhost ([127.0.0.1]:37519 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQVWM-0001Mo-W1 for geh-help-gnu-emacs@m.gmane.org; Wed, 08 Dec 2010 20:42:11 -0500 Original-Path: usenet.stanford.edu!postnews.google.com!j18g2000yqd.googlegroups.com!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 33 Original-NNTP-Posting-Host: 64.122.85.37 Original-X-Trace: posting.google.com 1282080417 20597 127.0.0.1 (17 Aug 2010 21:26:57 GMT) Original-X-Complaints-To: groups-abuse@google.com Original-NNTP-Posting-Date: Tue, 17 Aug 2010 21:26:57 +0000 (UTC) Complaints-To: groups-abuse@google.com Injection-Info: j18g2000yqd.googlegroups.com; posting-host=64.122.85.37; posting-account=EwI0QQoAAADdqmqX_mVfawBNtwyks2YE User-Agent: G2/1.0 X-HTTP-UserAgent: Opera/9.80 (X11; Linux x86_64; U; en) Presto/2.6.30 Version/10.61,gzip(gfe) Original-Xref: usenet.stanford.edu gnu.emacs.help:180805 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:76403 Archived-At: On Aug 17, 10:11=A0am, David Kastrup wrote: > Andrea Crotti writes: > > Andrea Crotti writes: > >> Sorry wrong command > >> =A0cmd =3D Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $REMO= TE $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 =3D /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -c -e '(= emerge-files-with-ancestor-command (getenv "LOCAL") (getenv "MERGED") (gete= nv "REMOTE"))' > > > instead of > > =A0 =A0 =A0 =A0 # cmd =3D Emacs -Q -f emerge-files-with-ancestor-comman= d $LOCAL $REMOTE $MERGED > > > should not that be the same thing? > > Huh? =A0Why should it? =A0emerge-files-with-ancestor-command does not tak= e > arguments. > > -- > David Kastrup I use Mercurial, but the merge tool config is basically the same. See http://mercurial.selenic.com/wiki/MergingWithEmacs for some solutions. I used to use the script there, now I use what would be the equivalent of 'emacs --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")"'