[PATCH 0 of 2] another attempt at filemerge improvements

[Matt Mackall]

On Wed, 2008-02-06 at 21:33 -0600, Steve Borho wrote:
> patch #1 - add checkchanged property to catch tools that abort and yet
>            return 0 (success)
> 
> patch #2 - allow ui.merge = <tool-with-args> to work essentially like it
>            did before the filemerge refactor.

Queued, thanks.

-- 
Mathematics is the supreme nostalgia of our time.