Mercurial > public > mercurial-scm > hg-stable

diff tests/test-completion.t @ 31176:fad5e299cfc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: accept --merge to allow merging across topo branches (issue5125)
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 13 Feb 2017 12:58:37 -0800
parents c4e8fa2b1c40
children ea0395eec67b
line wrap: on
line diff
--- a/tests/test-completion.t	Mon Feb 27 15:09:19 2017 -0800
+++ b/tests/test-completion.t	Mon Feb 13 12:58:37 2017 -0800
@@ -228,7 +228,7 @@
   serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate
   status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos, template
   summary: remote
-  update: clean, check, date, rev, tool
+  update: clean, check, merge, date, rev, tool
   addremove: similarity, subrepos, include, exclude, dry-run
   archive: no-decode, prefix, rev, type, subrepos, include, exclude
   backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user