To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4634.149.5.
- Committer: Vincent Ladeuil
- Date: 2010-04-02 12:19:17 UTC
- mto: (4634.139.8 2.0)
- mto: This revision was merged to the branch mainline in revision 5160.
- Revision ID: v.ladeuil+lp@free.fr-20100402121917-mb76ohvrylyqm7sp
Fixed as per John's review comments.
* bzrlib/merge.py:
(Merge3Merger.fix_root): Delete the useless (and bogus)
final_name() call, inline reparent_children and fix the comments.
* bzrlib/merge.py:
(Merge3Merger.fix_root): Delete the useless (and bogus)
final_name() call, inline reparent_children and fix the comments.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
