tutorial problems

[Matt Mackall]

On Mon, 2008-06-23 at 16:22 -0700, scottbruin wrote:
> Hi, I was cruising through the tutorial until I got to the 
> http://www.selenic.com/mercurial/wiki/index.cgi/TutorialConflict
> TutorialConflict  page.
> 
> When I do "hg merge," the tutorial says that, "Per default, Mercurial drops
> into the editor marking the conflicts in the file for manual resolution:" 
> It's not doing this for me..instead, nothing happens. I've tried turning on
> and off an external editor, and no luck.
> 
> So I'm stuck with no idea of how to resolve the conflict.

Try merge --debug

-- 
Mathematics is the supreme nostalgia of our time.