mq: don't tell user to commit merge that we already committed

Differential Revision: https://phab.mercurial-scm.org/D8000

hgext/mq.py

@@ -858,7 +858,7 b' class queue(object):'
         strip(self.ui, repo, [n], update=False, backup=False)
 
         ctx = repo[rev]
-        ret = hg.merge(ctx)
+        ret = hg.merge(ctx, remind=False)
         if ret:
             raise error.Abort(_(b"update returned %d") % ret)
         n = newcommit(repo, None, ctx.description(), ctx.user(), force=True)

tests/test-mq-merge.t

@@ -132,7 +132,6 b' Merge:'
   patch didn't work out, merging patcha
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
   applying patcha2
   now at: patcha2