Diff
Not logged in

Differences From:

File src/undo.c part of check-in [2ecc407d9b] - The "extra" and "clean" commands ignore the repository file if the repository happens to be within the check-out. Ticket c7b35be88. by drh on 2008-07-23 13:01:23. [view]

To:

File src/undo.c part of check-in [7b82a73bd3] - Remove the --yes option from the "revert" command. In its place, make the "revert" opration undoable. by drh on 2009-12-17 21:22:52. Also file src/undo.c part of check-in [76bc05d739] - merge with trunk by btheado on 2009-12-30 20:33:59. [view]

@@ -190,11 +190,11 @@
 ** COMMAND: undo
 **
 ** Usage: %fossil undo ?FILENAME...?
 **
-** Undo the most recent update or merge operation.  If FILENAME is
+** Undo the most recent update or merge or revert operation.  If FILENAME is
 ** specified then restore the content of the named file(s) but otherwise
-** leave the update or merge in effect.
+** leave the update or merge or revert in effect.
 **
 ** A single level of undo/redo is supported.  The undo/redo stack
 ** is cleared by the commit and checkout commands.
 */
@@ -229,10 +229,10 @@
 ** COMMAND: redo
 **
 ** Usage: %fossil redo ?FILENAME...?
 **
-** Redo the an update or merge operation that has been undone by the
-** undo command.  If FILENAME is specified then restore the changes
+** Redo the an update or merge or revert operation that has been undone
+** by the undo command.  If FILENAME is specified then restore the changes
 ** associated with the named file(s) but otherwise leave the update
 ** or merge undone.
 **
 ** A single level of undo/redo is supported.  The undo/redo stack