interactive merge (was Re: [ANN][PLUGIN] extending diff with graphical tools)

[Martin Pool]

On  3 May 2006, Aaron Bentley <abentley at aaronbentley.com> wrote:
> Martin Pool wrote:
> >On 03/05/2006, at 6:59 PM, Robert Collins wrote:
> >
> >>>I tend to run
> >>>
> >>>   vim `bzr conflicts`
> >>
> >>
> >>This is broken now, bzr conflicts returns more than just the  filenames.
> >
> >
> >Maybe we should add that back under perhaps 'bzr ls --conflicts'?
> 
> It sounds like you only want text conflicts for that output, not 
> contents conflicts (where no text merge could be performed) or other 
> conflicts.

That's true - so perhaps ls --text-conflicts or something.

-- 
Martin