← 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: 2010-01-20 14:21:03 UTC
  • mfrom: (4972.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100120142103-3omnefl6aio9bs0y
(nmb) Better explain --uncommitted in merge documentation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3647
3647
    committed to record the result of the merge.
3648
3648
 
3649
3649
    merge refuses to run if there are any uncommitted changes, unless
3650
 
    --force is given.
 
3650
    --force is given.  
 
3651
 
 
3652
    If one would like to merge changes from the working tree of the other
 
3653
    branch without merging any committed revisions, the --uncommitted option
 
3654
    can be given.
3651
3655
 
3652
3656
    To select only some changes to merge, use "merge -i", which will prompt
3653
3657
    you to apply each diff hunk and file change, similar to "shelve".