working in an emacs shell

[Neal Becker]

Boylan, Ross wrote:

> Running in a bash shell under non-graphical emacs I did an hg merge, and
> gibberish showed up on the screen when it tried to resolve conflicts.  My
> guess is it was trying to run vi in this environment, because there were
> messages about :quit.  Eventually I got out of it, but it was a mess.
> 
> 1. Is there a better way to do this within an emacs shell?
> https://mercurial.selenic.com/wiki/MergingWithEmacs has some notes, but
> I'm not at all sure they are appropriate if already running in an emacs
> shell.
> 

Emacs has ediff, which is pretty powerful.  I don't know if it can be used 
as the merge tool for hg, but I'd think this would be the way to go.