~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Frank Aspell
  • Date: 2009-02-17 11:40:05 UTC
  • mto: (4054.1.1 doc)
  • mto: This revision was merged to the branch mainline in revision 4056.
  • Revision ID: frankaspell@googlemail.com-20090217114005-ojufrp6rqht664um
Fixed typos.

Fixed some typos in bzr doc's using "aspell -l en -c FILENAME".

Show diffs side-by-side

added added

removed removed

Lines of Context:
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