Code review comment for lp:~doxxx/bzr/mergetools-commands

> I do.
>
> + ui.ui_factory.show_message('%d conflict(s) resolved.' %
> resolved)
> + unresolved = tree.conflicts()
> + if len(unresolved) > 0:
> + ui.ui_factory.show_message('Remaining conflicts:')
> + for conflict in unresolved:
> + ui.ui_factory.show_message(str(conflict))
>

*blink*, I missed that, sorry.

Still, auto does:

                    for conflict in un_resolved:
                        trace.note(conflict)
                    return 1
                else:
                    trace.note('All conflicts resolved.')
                    return 0

So if you want to do the same, I'll be fine, but let's do exactly the same then, use trace.note() and return some corresponding value.

> > The other cases mentions the number of remaining conflicts, I think you
> don't.
>
> If you would prefer just the number of remaining conflicts, I can do
> that instead.

That's also an option, I think the idea with mentioning only the number is that it would satisfy users who prefer less verbose output and can still see the conflicts with 'bzr conflicts -v'.

In any case, addressing such unification can be done in a further submission as long as you don't introduce another variation (which you don't expect for the details raised above).