diff tests/test-userguide.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 54a469cd5b26
children fbcf9e92097e 96ce1030d2fb
line wrap: on
line diff