← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
18
18
# point down
19
19
 
20
20
import os
21
 
import re
22
21
 
23
22
from bzrlib.lazy_import import lazy_import
24
23
lazy_import(globals(), """
46
45
 
47
46
 
48
47
class cmd_conflicts(commands.Command):
49
 
    """List files with conflicts.
 
48
    __doc__ = """List files with conflicts.
50
49
 
51
50
    Merge will do its best to combine the changes in two branches, but there
52
51
    are some kinds of problems only a human can fix.  When it encounters those,
99
98
 
100
99
 
101
100
class cmd_resolve(commands.Command):
102
 
    """Mark a conflict as resolved.
 
101
    __doc__ = """Mark a conflict as resolved.
103
102
 
104
103
    Merge will do its best to combine the changes in two branches, but there
105
104
    are some kinds of problems only a human can fix.  When it encounters those,