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-merge-halt.t
changeset 45826 21733e8c924f
parent 45150 dc5e5577af39
child 48270 3e66e4517744 
--- a/tests/test-merge-halt.t	Sat Nov 07 21:50:28 2020 -0800
+++ b/tests/test-merge-halt.t	Wed Oct 21 19:00:16 2020 -0700
@@ -28,7 +28,7 @@
   merging a failed!
   merging b failed!
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [1]
+  [240]
 
   $ hg resolve --list
   U a
@@ -45,7 +45,7 @@
   merging b
   merging a failed!
   merge halted after failed merge (see hg resolve)
-  [1]
+  [240]
 
   $ hg resolve --list
   U a
@@ -73,7 +73,7 @@
   merging b failed!
   continue merge operation (yn)? n
   merge halted after failed merge (see hg resolve)
-  [1]
+  [240]
 
   $ hg resolve --list
   U a
@@ -102,7 +102,7 @@
   merging b failed!
   continue merge operation (yn)? n
   merge halted after failed merge (see hg resolve)
-  [1]
+  [240]
 
   $ hg resolve --list
   R a
@@ -125,7 +125,7 @@
   merging b
   merging a failed!
   merge halted after failed merge (see hg resolve)
-  [1]
+  [240]
 
   $ hg resolve --list
   U a
@@ -146,7 +146,7 @@
   was merge of 'b' successful (yn)? n
   merging b failed!
   merge halted after failed merge (see hg resolve)
-  [1]
+  [240]
 
   $ hg resolve --list
   R a
mercurial