Mercurial > evolve
comparison tests/test-touch.t @ 2858:4b934144ed11
messages: use hyphenated '{phase,content}-divergent' in user messages
The hyphenated version is more readable and it's what we use the
{instabilities} template.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 24 Aug 2017 10:57:32 -0700 |
| parents | f6517779a7c4 |
| children | 06844693bb21 |
comparison
equal
deleted
inserted
replaced
| 2857:0c286d054bcd | 2858:4b934144ed11 |
|---|---|
| 42 | 42 |
| 43 $ hg touch . | 43 $ hg touch . |
| 44 [1] a | 44 [1] a |
| 45 reviving this changeset will create divergence unless you make a duplicate. | 45 reviving this changeset will create divergence unless you make a duplicate. |
| 46 (a)llow divergence or (d)uplicate the changeset? a | 46 (a)llow divergence or (d)uplicate the changeset? a |
| 47 2 new contentdivergent changesets | 47 2 new content-divergent changesets |
| 48 $ hg log -G | 48 $ hg log -G |
| 49 @ 4:[0-9a-f]{12} a (re) | 49 @ 4:[0-9a-f]{12} a (re) |
| 50 | 50 |
| 51 o 3:[0-9a-f]{12} ab (re) | 51 o 3:[0-9a-f]{12} ab (re) |
| 52 | 52 |