Mercurial > hg
comparison tests/test-completion.t @ 31166:fad5e299cfc7
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 |
comparison
equal
deleted
inserted
replaced
| 31165:81250d377611 | 31166:fad5e299cfc7 |
|---|---|
| 226 push: force, rev, bookmark, branch, new-branch, ssh, remotecmd, insecure | 226 push: force, rev, bookmark, branch, new-branch, ssh, remotecmd, insecure |
| 227 remove: after, force, subrepos, include, exclude | 227 remove: after, force, subrepos, include, exclude |
| 228 serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate | 228 serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate |
| 229 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos, template | 229 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos, template |
| 230 summary: remote | 230 summary: remote |
| 231 update: clean, check, date, rev, tool | 231 update: clean, check, merge, date, rev, tool |
| 232 addremove: similarity, subrepos, include, exclude, dry-run | 232 addremove: similarity, subrepos, include, exclude, dry-run |
| 233 archive: no-decode, prefix, rev, type, subrepos, include, exclude | 233 archive: no-decode, prefix, rev, type, subrepos, include, exclude |
| 234 backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user | 234 backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user |
| 235 bisect: reset, good, bad, skip, extend, command, noupdate | 235 bisect: reset, good, bad, skip, extend, command, noupdate |
| 236 bookmarks: force, rev, delete, rename, inactive, template | 236 bookmarks: force, rev, delete, rename, inactive, template |