Re: git mergetool again

[David Kastrup]

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