evolvecmd: use the evolvestate object passed as argument in _solveunstable Earlier if get a merge conflict, we used to initialize a new evolvestate object and used to save it. Let's start using the state object which we get in as argument as that will contain more data about the state.

test-drop.t
test-inhibit.t
test-simple4server.t
tests/test-simple4server-bundle2.t