← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/merging_changes.txt

  • Committer: Vincent Ladeuil
  • Date: 2011-05-16 17:48:58 UTC
  • mto: This revision was merged to the branch mainline in revision 5876.
  • Revision ID: v.ladeuil+lp@free.fr-20110516174858-5upoy1v4t6iasgso
Use positive forms where possible, fix the command help and the user guide.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/merging_changes.txt
31
31
 
32
32
  bzr merge bzr+ssh://mary@bill-laptop/cool-repo/cool-trunk
33
33
 
34
 
This sets the default merge branch if one is not already set. To change the
35
 
default after it is set, use the ``--remember`` option.
 
34
This sets the default merge branch if one is not already set.  Use
 
35
``--no-remember`` to avoid setting it. To change the default after it is set,
 
36
use the ``--remember`` option.
36
37
 
37
38
How does merging work?
38
39
----------------------