← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-07-25 22:03:13 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2664.
  • Revision ID: abentley@panoramicfeedback.com-20070725220313-3yi654e1utu1xd73
Avoid using builtins.merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4052
4052
    return mergeable, location_transport
4053
4053
 
4054
4054
 
4055
 
# Compatibility
4056
 
merge = _merge_helper
4057
 
 
4058
 
 
4059
4055
# these get imported and then picked up by the scan for cmd_*
4060
4056
# TODO: Some more consistent way to split command definitions across files;
4061
4057
# we do need to load at least some information about them to know of