← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-09-25 19:46:02 UTC
  • mfrom: (2839.5.3 merge.--changes)
  • Revision ID: pqm@pqm.ubuntu.com-20070925194602-h8z36snrc8eqjj4j
option -c for merge command (bialix,r=ian)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2701
2701
    _see_also = ['update', 'remerge', 'status-flags']
2702
2702
    takes_args = ['branch?']
2703
2703
    takes_options = [
 
2704
        'change',
2704
2705
        'revision',
2705
2706
        Option('force',
2706
2707
               help='Merge even if the destination tree has uncommitted changes.'),