bzr merge fails if deleted contents differ

Martin Pool martinpool at gmail.com
Fri Sep 30 07:35:39 BST 2005


On 30/09/05, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:

> This is now done in my bzr.24 branch.

Thanks, I've merged up to your r1090
(aaron.bentley at utoronto.ca-20050930040234-71c1a151f795e806) into
bzr.newformat.

--
Martin




More information about the bazaar mailing list