help-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: git mergetool again


From: Andrea Crotti
Subject: Re: git mergetool again
Date: Fri, 13 Aug 2010 22:47:59 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (darwin)

Andrea Crotti <address@hidden> 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..




reply via email to

[Prev in Thread] Current Thread [Next in Thread]