← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Martin Packman
  • Date: 2011-11-28 19:07:58 UTC
  • mfrom: (6318 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6319.
  • Revision ID: martin.packman@canonical.com-20111128190758-5gj44o5uzwz5sjfq
Merge bzr.dev to resolve conflicts with updated registry help strings

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
80
80
 
81
81
 
82
82
resolve_action_registry.register(
83
 
    'done', 'done', 'Marks the conflict as resolved' )
 
83
    'done', 'done', 'Marks the conflict as resolved.')
84
84
resolve_action_registry.register(
85
85
    'take-this', 'take_this',
86
 
    'Resolve the conflict preserving the version in the working tree' )
 
86
    'Resolve the conflict preserving the version in the working tree.')
87
87
resolve_action_registry.register(
88
88
    'take-other', 'take_other',
89
 
    'Resolve the conflict taking the merged version into account' )
 
89
    'Resolve the conflict taking the merged version into account.')
90
90
resolve_action_registry.default_key = 'done'
91
91
 
92
92
class ResolveActionOption(option.RegistryOption):