Joel's tutorial has a nice example where a kdiff3 GUI window pops up, with 4 partitions to help you resolve a merge conflict.
Question 1:In my newly Solaris 10 installation, there is no GUI (no hgtk or kdiff3 equivalent). Where can I get it?
Question 2: in my Windows/Cygwin installation, I don't know how to set it up. I set "export HGMERGE=merge", and upon conflict, hg merge exits with a return code = 1. But no GUI.
Question 3: once that 'hg merge' is executed, it is in an un-resolved state. How do I completely back out (back to before hg merge was executed)?
Question 4: what does "hg resolve" do? in my example, I have 2 different changes to the same line. It did not resolve anything:
$ hg resolve recipe merging recipe The system cannot find the path specified. merging recipe failed!