comparison tests/test-stabilize-conflict.t @ 3741:ec460882eab7

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.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 29 Apr 2018 19:18:54 +0530
parents f6979d64b9fb
children 19ec729f3ca2 ededd22e7c7b
comparison
equal deleted inserted replaced
3740:07e246deb612 3741:ec460882eab7