Mercurial > evolve
comparison tests/test-touch.t @ 2856:f6517779a7c4
warning: rename warning message
divergent has been renamed into contentdivergent. Use their renamed
counterpart in warning message for new unstable changesets.
Renaming done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 24 Aug 2017 09:12:09 +0200 |
| parents | 66796d7b5415 |
| children | 4b934144ed11 |
comparison
equal
deleted
inserted
replaced
| 2855:1db0137297f4 | 2856:f6517779a7c4 |
|---|---|
| 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 divergent changesets | 47 2 new contentdivergent 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 |