/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

  • Committer: Vincent Ladeuil
  • Date: 2010-03-02 07:30:27 UTC
  • mto: (5067.1.1 integration)
  • Revision ID: v.ladeuil+lp@free.fr-20100302073027-96nrfbr9dw6vk13n
Address some Andrew's review points.

* bzrlib/conflicts.py:
(ContentsConflict._take_it): Use a better parameter name to avoid
confusion.

* NEWS: 
Fix typos.
Filename Latest Rev Last Changed Committer Comment Size
..
__init__.py 4763.2.4 16 years ago John Arbash Meinel merge bzr.2.1 in preparation for NEWS entry. 7.6 KB Diff Download File
test_compare.py 4722.1.1 16 years ago Andrew Bennetts Merge lp:bzr/2.0 into lp:bzr, duplicating relevant 82.7 KB Diff Download File