working in an emacs shell

[Matt Mackall]

On Mon, 2015-08-17 at 19:54 +0000, 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.

First, start by reading:

https://mercurial.selenic.com/wiki/MergeToolConfiguration

..which will explain why vi is getting involved and how to do your own
configuration.

There's probably a way to redirect the merge to an emacs server and thus
back into your current emacs session. If you're partial to legacy merge
markers, you might want to try contrib/editmerge.

-- 
Mathematics is the supreme nostalgia of our time.