Re: git mergetool again

[Andrea Crotti]

Andrea Crotti <andrea.crotti.0@gmail.com> 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..