/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: Canonical.com Patch Queue Manager
  • Date: 2011-05-09 08:12:01 UTC
  • mfrom: (5837.1.3 inter-no-default)
  • Revision ID: pqm@pqm.ubuntu.com-20110509081201-1nreh088nt7xh3l1
(jelmer) Require the default for Inter.get to be explicitly registered.
 (Jelmer Vernooij)

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
34
This sets the default merge branch if one is not already set. To change the
35
35
default after it is set, use the ``--remember`` option.