原文:How do I see what I changed to resolve a mercurial merge conflict?
I just merged changes from our maintenance branch into our development branch. (We branch by cloning the mercurial repository, not with named branches.) There were a few conflicts, so I had to ...