← 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: John Ferlito
  • Date: 2009-09-02 04:31:45 UTC
  • mto: (4665.7.1 serve-init)
  • mto: This revision was merged to the branch mainline in revision 4913.
  • Revision ID: johnf@inodes.org-20090902043145-gxdsfw03ilcwbyn5
Add a debian init script for bzr --serve

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 accidently start making changes in the
 
67
If you have several branches and you accidentally 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