Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-graft.t
changeset 38155 5736570718fe
parent 38154 decdb587ea12
child 38237 66fc2ef8dbff 
--- a/tests/test-graft.t	Fri May 25 17:21:01 2018 +0530
+++ b/tests/test-graft.t	Sat May 26 02:11:09 2018 +0530
@@ -1456,7 +1456,7 @@
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
-  (use 'hg resolve' and 'hg graft --continue --user batman')
+  (use 'hg resolve' and 'hg graft --continue')
   [255]
 
   $ echo wat > b
@@ -1506,7 +1506,7 @@
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
-  (use 'hg resolve' and 'hg graft --continue --date '1234560000 120'')
+  (use 'hg resolve' and 'hg graft --continue')
   [255]
 
   $ echo foobar > b
mercurial