tests/test-completion.t

--- a/tests/test-completion.t	Wed Sep 30 21:22:31 2015 -0700
+++ b/tests/test-completion.t	Fri Oct 02 13:00:47 2015 -0700
@@ -91,6 +91,7 @@
   debugknown
   debuglabelcomplete
   debuglocks
+  debugmergestate
   debugnamecomplete
   debugobsolete
   debugpathcomplete
@@ -251,6 +252,7 @@
   debugknown: 
   debuglabelcomplete: 
   debuglocks: force-lock, force-wlock
+  debugmergestate: 
   debugnamecomplete: 
   debugobsolete: flags, record-parents, rev, date, user
   debugpathcomplete: full, normal, added, removed