← 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: INADA Naoki
  • Date: 2011-05-17 00:45:09 UTC
  • mfrom: (5875 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5891.
  • Revision ID: songofacandy@gmail.com-20110517004509-q58negjbdjh7t6u1
merge from lp:bzr

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.  Use
35
 
``--no-remember`` to avoid setting it. To change the default after it is set,
36
 
use the ``--remember`` option.
 
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.
37
36
 
38
37
How does merging work?
39
38
----------------------