Matt Mackall wrote: > These patches add a new 'resolve' command that is similar in > functionality to the imerge extension, but more closely integrated > with Mercurial. Oh, thank god. The lack of user-visible conflict tracking has been a huge problem for ages. I'm really relieved to see this go into the core. <b