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: Fri, 13 Aug 2010 22:00:55 +0200 Organization: Organization?!? Message-ID: <87iq3e5ll4.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 1291865925 31060 80.91.229.12 (9 Dec 2010 03:38:45 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 9 Dec 2010 03:38:45 +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:38:41 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 1PQXL6-0002Z4-Ii for geh-help-gnu-emacs@m.gmane.org; Thu, 09 Dec 2010 04:38:40 +0100 Original-Received: from localhost ([127.0.0.1]:47170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQXL5-0008It-RR for geh-help-gnu-emacs@m.gmane.org; Wed, 08 Dec 2010 22:38:39 -0500 Original-Path: usenet.stanford.edu!news.tele.dk!news.tele.dk!small.news.tele.dk!kanaga.switch.ch!switch.ch!takemy.news.telefonica.de!telefonica.de!newsfeed.arcor.de!newsspool2.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:1kEVQKzkpevyDjykIrpDxuAQDMc= Original-Lines: 31 Original-NNTP-Posting-Date: 13 Aug 2010 22:00:56 CEST Original-NNTP-Posting-Host: 8c0bfa27.newsspool3.arcor-online.net Original-X-Trace: DXC=Q<; VmbJYKN?; ]cDoEWD6A4McF=Q^Z^V384Fo<]lROoR18kF1_LiI6ENVa=3>5MOK`al0oR:_4M9:DIfcdQZ_3 Original-X-Complaints-To: usenet-abuse@arcor.de Original-Xref: usenet.stanford.edu gnu.emacs.help:180681 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:76563 Archived-At: Andrea Crotti writes: > I really have to solve this before I go completely insane :D > It's more a problem of git but could make life easier to many emacs > user, so I think it's not offtopic. > > Anyway I like emerge and it would be nice to use it to solve conflicts > with git. > Now the default configuration for me is really bad, because it opens a > new emacs, loads the WHOLE configuration and in short doesn't work at > all! > > So I read again the doc and ended up with something like > [mergetool "mymerge"] > cmd = 'exec /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -e \"(ediff-files (getenv \"LOCAL\") (getenv \"MERGED\") (getenv \"REMOTE\"))\"' > [merge] > tool = mymerge > > after trying all possible easier solutions. > > but now way it doesn't work. > I just need to fire up the editor with ediff-files on those three files, > which at the call moment are part of the environment (I think). ediff-files is not emerge. If you want to use ediff, don't use a mergetool. Instead just use M-x smerge-ediff RET on the unmerged file with the conflict markers. -- David Kastrup