Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-completion.t
changeset 39392 5d00e6061ba2
parent 39282 828a45233036
child 39753 b05b4b91de3d 
--- a/tests/test-completion.t	Sat Sep 01 02:01:55 2018 -0400
+++ b/tests/test-completion.t	Sun Aug 26 15:52:34 2018 -0400
@@ -331,7 +331,7 @@
   phase: public, draft, secret, force, rev
   recover: 
   rename: after, force, include, exclude, dry-run
-  resolve: all, list, mark, unmark, no-status, tool, include, exclude, template
+  resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template
   revert: all, date, rev, no-backup, interactive, include, exclude, dry-run
   rollback: dry-run, force
   root:
mercurial