/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: John Arbash Meinel
  • Date: 2011-04-20 12:27:33 UTC
  • mfrom: (4379.5.7 faster-dirstate-save)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110420122733-xh83w1u6nadvf637
Merge Ian's work on faster dirstate operations (not writing out new dirstate for uninteresting changes).

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.