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-tools.t
changeset 46417 768056549737
parent 46139 3ca5ca380a34
child 46816 ea8bfd33c22a 
--- a/tests/test-merge-tools.t	Fri Jan 29 12:50:10 2021 -0500
+++ b/tests/test-merge-tools.t	Fri Jan 29 12:16:55 2021 -0800
@@ -377,7 +377,7 @@
   merging f
   some fail message
   abort: $TESTTMP/mybrokenmerge.py hook failed
-  [255]
+  [40]
   $ aftermerge
   # cat f
   revision 1
mercurial