Mercurial > public > mercurial-scm > hg

diff tests/test-debugcomplete.out @ 9646:5b001f534452

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: adding --no-status to resolve to match status
author timeless <timeless@gmail.com>
date Sun, 25 Oct 2009 13:27:54 +0100
parents 9e76232fbfbe
children 2f1ab7f77ddc
line wrap: on
line diff
--- a/tests/test-debugcomplete.out	Wed Oct 21 12:41:28 2009 +0300
+++ b/tests/test-debugcomplete.out	Sun Oct 25 13:27:54 2009 +0100
@@ -218,7 +218,7 @@
 paths: 
 recover: 
 rename: after, force, include, exclude, dry-run
-resolve: all, list, mark, unmark, include, exclude
+resolve: all, list, mark, unmark, no-status, include, exclude
 revert: all, date, rev, no-backup, include, exclude, dry-run
 rollback: 
 root: