[Monotone-devel] conflicts store vs show_conflicts

[Stephen Leake]

As issue 108 pointed out, it might be good to move 'mtn show_conflicts'
to be part of the 'mtn conflicts' command group, so it is described by
'mtn help conflicts'.

In addition, I need 'mtn au conflicts store' for Emacs DVC. There is 'au
show_conflicts', but that turned out to not be useful for DVC; does
guitone (or anything else) use it?.

So I propose:

1) add  'mtn conflicts show_all'; same behavior as 'mtn show_conflicts'.

    keep 'mtn show_conflicts' (with an alias if possible), but deprecate
    it. 

2) add 'mtn au conflicts store'

3) delete 'mtn au show_conflicts'
 
-- 
-- Stephe