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

[Aaron Bentley]

Matthew Hannigan wrote:
> On Thu, May 04, 2006 at 05:59:54PM +1000, Martin Pool wrote:
> 
>>That's true - so perhaps ls --text-conflicts or something.
> 
> 
> bzr conflicts --files?

I don't think that's right.  You specifically want text conflicts, not 
binary file conflicts, not path conflicts, etc.  --files does not imply 
"text" to me.

Aaron