Mercurial > hg
diff tests/test-completion.t @ 21552:61151f429a5f
update: introduce --tool for controlling the merge tool
Update is a kind of merge and may also need a merge tool and should have the
options described in the merge-tools help.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 19 May 2014 01:53:34 +0200 |
| parents | 422981492ace |
| children | bee0e1cffdd3 |
line wrap: on
line diff
--- a/tests/test-completion.t Fri May 02 01:09:14 2014 +0200 +++ b/tests/test-completion.t Mon May 19 01:53:34 2014 +0200 @@ -212,7 +212,7 @@ serve: accesslog, daemon, daemon-pipefds, 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 summary: remote - update: clean, check, date, rev + update: clean, check, date, rev, tool addremove: similarity, include, exclude, dry-run archive: no-decode, prefix, rev, type, subrepos, include, exclude backout: merge, parent, rev, tool, include, exclude, message, logfile, date, user