evolve: show cset hash in "merging conetnt-divergent changeset"
While I was here I also mae de it repo.ui.status() instead of repo.ui.note() to
align the behavior with rest of the messages.
# utility to setup pythonpath to point into the tested repositoryexportSRCDIR=`dirname$TESTDIR`if[-n"$PYTHONPATH"];thenexportHGTEST_ORIG_PYTHONPATH=$PYTHONPATHexportPYTHONPATH=$SRCDIR:$PYTHONPATHelseexportPYTHONPATH=$SRCDIRfi