← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Frank Aspell
  • Date: 2009-02-22 16:54:02 UTC
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: frankaspell@googlemail.com-20090222165402-2myrucnu7er5w4ha
Fixing various typos

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3287
3287
 
3288
3288
            bzr merge -r 81..82 ../bzr.dev
3289
3289
 
3290
 
        To apply a merge directive contained in in /tmp/merge:
 
3290
        To apply a merge directive contained in /tmp/merge:
3291
3291
 
3292
3292
            bzr merge /tmp/merge
3293
3293
    """