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

[Martin Pool]

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'?

-- 
Martin