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

  • Committer: Martin Pool
  • Date: 2010-04-28 07:03:38 UTC
  • mfrom: (5188 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5189.
  • Revision ID: mbp@sourcefrog.net-20100428070338-2af8y3takgfkrkyp
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
46
46
 
47
47
 
48
48
class cmd_conflicts(commands.Command):
49
 
    """List files with conflicts.
 
49
    __doc__ = """List files with conflicts.
50
50
 
51
51
    Merge will do its best to combine the changes in two branches, but there
52
52
    are some kinds of problems only a human can fix.  When it encounters those,
99
99
 
100
100
 
101
101
class cmd_resolve(commands.Command):
102
 
    """Mark a conflict as resolved.
 
102
    __doc__ = """Mark a conflict as resolved.
103
103
 
104
104
    Merge will do its best to combine the changes in two branches, but there
105
105
    are some kinds of problems only a human can fix.  When it encounters those,