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
[flake8]
ignore =
#closing bracket does not match indentation of opening bracket's line
E123,
# closing bracket does not match visual indentation
E124,
# visually indented line with same indent as next logical line
E129,
# at least two spaces before inline comment
E261,
# too many leading '#' for block comment
E266,
# expected 2 blank lines, found 0
E302,
# expected 2 blank lines after end of function or class
E305,
# module level import not at top of file
E402,
# line too long (82 > 79 characters)
E501,
# do not assign a lambda expression, use a def
E731,
# class names should use CapWords convention
N801,
# line break occurred before a binary operator
W503
builtins=xrange, execfile