Merging with Emacs and ediff-mode

[Matt Mackall]

On Fri, 2008-11-28 at 15:28 +0100, Bastian Doetsch wrote:
> >
> > But ... long time ago Mercurial used merge scripts similar to yours
> > (http://www.selenic.com/mercurial/wiki/index.cgi/hgmerge). Matt  
> > rewrote
> > that to use prioritized merge-tools selected on first available match
> > (http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration 
> > ).
> > When scripts are used then this method doesn't work properly. So it
> > would be nice if we could avoid using scripts. Are they really needed?
> > Alternatively: what feature is needed before you can get rid of the  
> > the
> > script? Perhaps just a way to specify custom premerge commands in
> > merge-tools configuration?
> >
> > /Mads
> 
> Having an internal merge tool like internal:fail that does a premerge,  
> but doesn't launch a merge tool automatically would be nice. Possible  
> name: internal:premerge.

Already exists: internal:merge.

-- 
Mathematics is the supreme nostalgia of our time.