/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_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2010-03-13 02:05:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5089.
  • Revision ID: jelmer@samba.org-20100313020522-h1ajuadhobgcrv1s
Add docstring.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
65
65
 
66
66
 
67
67
class BaseMergeDirective(object):
 
68
    """A request to perform a merge into a branch.
 
69
 
 
70
    This is the base class that all merge directive implementations 
 
71
    should derive from.
 
72
    """
68
73
 
69
74
    hooks = MergeDirectiveHooks()
70
75