← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-01-15 00:34:05 UTC
  • mfrom: (3104.4.7 bzr-http-client)
  • Revision ID: pqm@pqm.ubuntu.com-20080115003405-jfuumkpctmvl2e4r
(andrew) Calculate remote path relative to the shared medium in
        _SmartClient.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/adv_merging.txt
64
64
Merging uncommitted changes
65
65
---------------------------
66
66
 
67
 
If you have several branches and you accidentally start making changes in the
 
67
If you have several branches and you accidently start making changes in the
68
68
wrong one, here are the steps to take to correct this. Assuming you began
69
69
working in branch ``foo`` when you meant to work in branch ``bar``:
70
70