[MERGE REVIEW] merge_inner honours ignore_zero parameter

[Martin Pool]

On  6 Mar 2006, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> Aaron Bentley wrote:
> > Hi all,
> > 
> > merge_inner doesn't currently honour the ignore_zero parameter.  This is
> > a one-line fix, except for the test cases.
> 
> Now with actual patch!  More filling!  Tastes great!

+1

We should probably support stacked log-capturing.

Perhaps it would be better for the merge code to report its results
through, or into, some kind of result object, rather than writing
messages from the middle of the merge code itself?
-- 
Martin