On Mon, 2007-08-13 at 14:30 -0700, Mike Kupfer wrote: > Another alternative would be to let users plug in their favorite 3-way > merge tool, such as the text-based thing that Dave Powell recently > wrote.
+1 from me. ideally you'd just use whatever hg merge would use. I would be annoyed if I had to use a graphical merge tool. - Bill