/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-05 09:32:25 UTC
  • mto: (5050.77.1 2.2) (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110705093225-p1w0eri2tuqwvp1w
Fix typo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1625
1625
                    other_path = '<deleted>'
1626
1626
                else:
1627
1627
                    if other_parent == self.other_tree.get_root_id():
1628
 
                        # The tree transform don't know about the other root,
 
1628
                        # The tree transform doesn't know about the other root,
1629
1629
                        # so we special case here to avoid a NoFinalPath
1630
1630
                        # exception
1631
1631
                        parent_path = ''