Viewing all changes in revision 4597.2.27.
- Committer: Vincent Ladeuil
- Date: 2010-03-02 07:30:27 UTC
- mto: (5067.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5068.
- 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.
* bzrlib/conflicts.py:
(ContentsConflict._take_it): Use a better parameter name to avoid
confusion.
* NEWS:
Fix typos.
- files modified:
- NEWS
expand all
collapse all
added
removed
