Re: [Monotone-devel] improving show_conflicts

[Stephen Leake]

Stephen Leake <address@hidden> writes:

> Derek Scherger <address@hidden> writes:
>
>> Alternatively, update --dry-run and merge --dry-run (or --pretend or
>> --test or whatever)
>
> Given the behavior of merge for N > 2, I think this makes much more
> sense. 

On the other hand, for automate, commands should do small operations,
so show_conflicts --merge would be better. I'll have to look at the
code for more insight.

-- 
-- Stephe