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.

     1

. $TESTDIR/testlib/pythonpath.sh

     2

     3

cat >> $HGRCPATH << EOF

     4

[extensions]

     5

docgraph=

     6

EOF