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

Revision history for this message
Vincent Ladeuil (vila) wrote :

> > This seems to depart from the way the conflicts are reported in the other
> cases for no good reason, can you unify it instead ?
>
> It's the same way that the 'auto' action reports it.

Sorry for being imprecise.

'auto' lists the conflicts resolved, I don't think you do.
The other cases mentions the number of remaining conflicts, I think you don't.

I'd like the 'auto' case to be fixed too but I haven't yet found the right balance there.

« Back to merge proposal