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-conflict.t
changeset 48513 47f2a82ae3e4
parent 48335 b7fde9237c92
child 48566 50de08904c63 
--- a/tests/test-conflict.t	Fri Dec 17 17:56:13 2021 +0100
+++ b/tests/test-conflict.t	Sat Dec 18 11:47:03 2021 +0100
@@ -1,7 +1,3 @@
-TODO: fix rhg bugs that make this test fail when status is enabled
-  $ unset RHG_STATUS
-
-
   $ hg init
   $ cat << EOF > a
   > Small Mathematical Series.
mercurial