evolve: fix test-stabilize-conflict.t to match new extra computation in core Recent patches changed the way we compute extras for rebase and graft. This changes the hashes in evolve's tests. This patch fixes the test test-stabilize-conflict.t.

doc generated with sphinx. tutorial exported using sphinxedhg

http://hg.piranha.org.ua/sphinxedhg/