← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/developers/nested-trees.txt

  • Committer: Jelmer Vernooij
  • Date: 2012-04-01 23:35:52 UTC
  • mto: This revision was merged to the branch mainline in revision 6518.
  • Revision ID: jelmer@samba.org-20120401233552-ovkuloera0dcz5gb
Fix some paths, thanks Marius.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/nested-trees.txt
285
285
 
286
286
Example commands::
287
287
 
288
 
 $ bzr merge -d project http://curtis.org/trunk#library2
 
288
 $ bzr merge -d project http://curtis.org/trunk/library2
289
289
 
290
290
 Or alternatively:
291
 
 $ bzr merge -d project/library2 http://curtis.org/trunk#library2
 
291
 $ bzr merge -d project/library2 http://curtis.org/trunk/library2
292
292
 
293
293
Case 8
294
294
~~~~~~