# HG changeset patch # User Sushil khanchi # Date 1554189117 -19800 # Node ID f0bda6a6d93bd2f6b6cfb6bf6780acb0d69e4ab8 # Parent 256b28ce03e318491ed5d79946c58ad7fc68a5fe evolve: remove todo markers from a test which has been fixed diff -r 256b28ce03e3 -r f0bda6a6d93b tests/test-prev-next.t --- a/tests/test-prev-next.t Fri Apr 05 22:28:07 2019 +0200 +++ b/tests/test-prev-next.t Tue Apr 02 12:41:57 2019 +0530 @@ -443,7 +443,6 @@ Test that --merge still works fine with commands.update.check set -XXX: yes we want --merge and we passed that! $ hg config commands.update.check noconflict $ echo hi > bar @@ -465,7 +464,6 @@ Testing --merge works with other values of commands.update.check also -XXX: things are broken! $ hg prev --config commands.update.check=abort abort: uncommitted changes (do you want --merge?)