Rev 3007: (Adeodato Simó) Fix typos in revert's help. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3007
revision-id: pqm at pqm.ubuntu.com-20071119235416-b8dvkk17vngbf99s
parent: pqm at pqm.ubuntu.com-20071117180742-59zhz30s7839y41j
parent: dato at net.com.org.es-20071119183803-w90r4p7uwxysvrno
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-11-19 23:54:16 +0000
message:
  (Adeodato Simó) Fix typos in revert's help.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 3006.1.1
    merged: dato at net.com.org.es-20071119183803-w90r4p7uwxysvrno
    parent: pqm at pqm.ubuntu.com-20071117180742-59zhz30s7839y41j
    committer: Adeodato Simó <dato at net.com.org.es>
    branch nick: typos
    timestamp: Mon 2007-11-19 19:38:03 +0100
    message:
      Fix typos in revert's help.
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-11-16 04:45:22 +0000
+++ b/bzrlib/builtins.py	2007-11-19 18:38:03 +0000
@@ -3091,8 +3091,8 @@
 
     The working tree contains a list of pending merged revisions, which will
     be included as parents in the next commit.  Normally, revert clears that
-    list as well as reverting the files.  If any files, are specified, revert
-    leaves the pending merge list alnone and reverts only the files.  Use "bzr
+    list as well as reverting the files.  If any files are specified, revert
+    leaves the pending merge list alone and reverts only the files.  Use "bzr
     revert ." in the tree root to revert all files but keep the merge record,
     and "bzr revert --forget-merges" to clear the pending merge list without
     reverting any files.