tutorial problems

[scottbruin]

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.

Thanks for any help!

Scott H
-- 
View this message in context: http://www.nabble.com/tutorial-problems-tp18080545p18080545.html
Sent from the Mercurial mailing list archive at Nabble.com.