Mercurial > public > mercurial-scm > hg

diff tests/test-backout.t @ 27624:d46db4390715

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: suggest the next action Expose afterresolvedstates to allow graft and similar to suggest a message when resolving results in no unresolved files. If there isn't a matching state in afterresolvedstates, then if verbose, suggest commiting.
author timeless <timeless@mozdev.org>
date Thu, 24 Dec 2015 19:25:44 +0000
parents 296d55def9c4
children ce76c4d2b85c
line wrap: on
line diff
--- a/tests/test-backout.t	Mon Jan 04 21:52:44 2016 -0800
+++ b/tests/test-backout.t	Thu Dec 24 19:25:44 2015 +0000
@@ -714,6 +714,7 @@
   my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437
    premerge successful
   (no more unresolved files)
+  continue: hg commit
   $ hg status
   M foo
   ? foo.orig