[Ilugc] resolving conflicts in mercurial

[Kenneth Gonsalves]

hi,
how does one resolve conflicts in mercurial? In subversion one just edits the 
file and then do svn resolve filename and it is resolved. This does not seem to 
work in mercurial - and I find the docs unclear also. I notice two files on a 
resolve - one is marked .orig. Whatever I do the hg reports merge failure. Any 
tips?
-- 
regards
kg
http://lawgon.livejournal.com
_______________________________________________
ILUGC Mailing List:
http://www.ae.iitm.ac.in/mailman/listinfo/ilugc