tests/test-completion.t
changeset 35704 41ef02ba329b
parent 35562 6580cf751418
child 35745 3bd8ab4c80a5
--- a/tests/test-completion.t	Thu Jan 04 21:37:03 2018 -0800
+++ b/tests/test-completion.t	Mon Jan 08 19:41:47 2018 +0530
@@ -229,7 +229,7 @@
   forget: include, exclude
   init: ssh, remotecmd, insecure
   log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude
-  merge: force, rev, preview, tool
+  merge: force, rev, preview, abort, tool
   pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure
   push: force, rev, bookmark, branch, new-branch, pushvars, ssh, remotecmd, insecure
   remove: after, force, subrepos, include, exclude