# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1583364092 28800
# Node ID 307bb57ff2ce916005394b2e73bc7088eefd77dd
# Parent  9b8d4403b73567a4e4b3e375c82bb043a873991a
tests: adapt now that Mercurial clears the merge state for empty wdir

`hg evolve` forgot to clear the merge state when its attempt to commit
resulted in no commit because the working copy had no changes. That
resulted in test-evolve-issue5967.t showing a conflict state that
shouldn't be there. The responsibility for clearing the merge state
was moved into Mercurial in Mercurial in 6a34e438461b (commit: clear
resolved mergestate even if working copy is clean, 2020-02-28), so the
bug is now fixed in `hg evolve`, which impacts that test case.

CORE-TEST-OUTPUT-UPDATE: 6a34e438461b

diff -r 9b8d4403b735 -r 307bb57ff2ce tests/test-evolve-issue5967.t
--- a/tests/test-evolve-issue5967.t	Fri Mar 06 21:37:28 2020 +0700
+++ b/tests/test-evolve-issue5967.t	Wed Mar 04 15:21:32 2020 -0800
@@ -69,6 +69,6 @@
        rewritten(description, content) as 4d6fec23dcc4 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg olog --hidden --all 1
-  %  dd9b5dd30cd6 (1) banana
+  x  dd9b5dd30cd6 (1) banana
        pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)