~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-06 04:33:55 UTC
  • mfrom: (4031.3.3 faspell-typos)
  • Revision ID: pqm@pqm.ubuntu.com-20090406043355-a94p92pr191lpmv1
(Matt Nordhoff, Frank Aspell) Fix typos in documentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3414
3414
 
3415
3415
            bzr merge -r 81..82 ../bzr.dev
3416
3416
 
3417
 
        To apply a merge directive contained in in /tmp/merge:
 
3417
        To apply a merge directive contained in /tmp/merge:
3418
3418
 
3419
3419
            bzr merge /tmp/merge
3420
3420
    """