simplemerge stdout/stderr abuse

[Matt Mackall]

On Thu, 2009-04-30 at 23:50 -0500, Steve Borho wrote:
> As part of the ui() cleanup going on, I've been looking for places
> where output is sent to stdout without the use of a ui instance.  It
> seems that most of them have been fixed except for this one:
> 
> simplemerge.warn() writes directly to stderr and calls flush() on
> stdout and stderr.  This is where the 'warning: conflicts during
> merge.' messages come from.  I would like for them to be captured to
> ui.warn().  Would it be ok to pass a ui to the simplemerge function?
> It looks like it would be a very simple patch.

Should be fine.

-- 
http://selenic.com : development and support for Mercurial and Linux