working in an emacs shell

[Boylan, Ross]

I've updated https://mercurial.selenic.com/wiki/MergingWithEmacs with how I got this  to work in emacs24.*
I also added a note on the top about using the emacs version control module.

I don't know if what I did was the best way, but it seemed to work.

Thanks for your help.

Ross

* Including  something so commit messages will work.  Probably diff's still need work.
________________________________________
From: Matt Mackall [mpm at selenic.com]
Sent: Tuesday, August 18, 2015 10:43 AM
To: Boylan, Ross
Cc: mercurial at selenic.com
Subject: Re: working in an emacs shell

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.