~bzr-pqm/bzr/bzr.dev

Committer: Martin Pool
Date: 2005-11-17 01:02:25 UTC
mto: (1185.74.1 bzr.dev (Main development branch)) (1505.1.18 bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1509.
Revision ID: mbp@sourcefrog.net-20051117010225-1be5054d78de0774

Add alias 'resolved'

added added

removed removed

class cmd_resolve(bzrlib.commands.Command):

"""Mark a conflict as resolved.

"""

aliases = ['resolved']

takes_args = ['file*']

takes_options = ['all']

def run(self, file_list=None, all=False):