/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: Aaron Bentley
  • Date: 2007-02-07 16:10:56 UTC
  • mto: This revision was merged to the branch mainline in revision 2272.
  • Revision ID: abentley@panoramicfeedback.com-20070207161056-iouamzaiam0ru7mf
PEP8-ness

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
963
963
    return merger.do_merge()
964
964
 
965
965
def get_merge_type_registry():
966
 
    """Merge type registry is in option to avoid circular imports.
 
966
    """Merge type registry is in bzrlib.option to avoid circular imports.
967
967
 
968
968
    This method provides a sanctioned way to retrieve it.
969
969
    """