Viewing all changes in revision 3874.2.10.
- Committer: Vincent Ladeuil
- Date: 2009-01-14 12:27:02 UTC
- mto: (3874.4.6 refactor-delta-show)
- mto: This revision was merged to the branch mainline in revision 3942.
- Revision ID: v.ladeuil+lp@free.fr-20090114122702-iwqhiq00cxpcv43u
Fix typo.
* bzrlib/merge.py:
(Merge3Merger.merge_contents): Fix typo in doc string.
* bzrlib/merge.py:
(Merge3Merger.merge_contents): Fix typo in doc string.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
