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 48335 b7fde9237c92
parent 46108 bdc2bf68f19e
child 48513 47f2a82ae3e4 
--- a/tests/test-conflict.t	Fri Nov 19 11:20:10 2021 +0100
+++ b/tests/test-conflict.t	Tue Nov 09 19:55:46 2021 +0100
@@ -1,3 +1,7 @@
+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