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

Matthew Hannigan mlh at zip.com.au
Thu May 4 13:12:18 BST 2006

Previous message: interactive merge (was Re: [ANN][PLUGIN] extending diff with graphical tools)
Next message: interactive merge (was Re: [ANN][PLUGIN] extending diff with graphical tools)
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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?

Previous message: interactive merge (was Re: [ANN][PLUGIN] extending diff with graphical tools)
Next message: interactive merge (was Re: [ANN][PLUGIN] extending diff with graphical tools)
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the bazaar mailing list