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.
# setup config and various utility to test new heads checks on push.$TESTDIR/testlib/common.shcat>>$HGRCPATH<<EOF[ui]# simpler log outputlogtemplate ="{node|short} ({phase}): {desc}\n"[phases]# non publishing serverpublish=False[extensions]# we need to strip some changeset for some test casesstrip=evolve=EOFsetuprepos(){echocreatingbasicserverandclientrepohginitservercdservermkcommitroothgphase--public.mkcommitA0cd..hgcloneserverclient}