/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Gordon Tyler
  • Date: 2011-06-30 21:00:38 UTC
  • mto: This revision was merged to the branch mainline in revision 6007.
  • Revision ID: gordon@doxxx.net-20110630210038-bzscps46jgcqtkr0
https://launchpad.net/bugs/784505
Use known executables for win32 and other platforms in test_exe_on_path.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/merging_changes.txt
29
29
has done in his. In this case, she needs to explicitly give the URL the
30
30
first time, e.g.::
31
31
 
32
 
  bzr merge sftp://mary@bill-laptop/cool-repo/cool-trunk
 
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
----------------------