To get this branch, use:

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

Viewing all changes in revision 0.200.619.

Committer: Jelmer Vernooij
Date: 2009-10-07 14:18:07 UTC
mto: <a title="Merged In 0.312.1" href="/bzr/brz/remove-bazaar/revision/0.312.1?remember=7498.1.1">(0.312.1 master) <a title="Merged In 6883.23.1" href="/bzr/brz/remove-bazaar/revision/6883.23.1?remember=7498.1.1">(6883.23.1 bundle-git)
mto: This revision was merged to the branch mainline in revision 6960 .
Revision ID: jelmer@samba.org-20091007141807-bf5cm0ywxq3e77zv

Provide dummy WorkingTree.conflicts() implementation rather than spending a lot of time not finding any conflicts.

added added

removed removed