/brz/remove-bazaar : revision 4312.1.3

Committer: John Arbash Meinel
Date: 2009-05-01 18:09:24 UTC
mto: This revision was merged to the branch mainline in revision 4322 .
Revision ID: john@arbash-meinel.com-20090501180924-bco4vmhymopg5lls

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

Different sides deleting different amounts is now a conflict.

This is because the final 'lines' are different, but something occurred
on each side.

added added

removed removed