Mercurial > evolve
diff tests/test-evolve-content-divergent-interrupted.t @ 5297:a73cdef2e33f
evolve: rename `evolve_source_*` to `divergence_source_*`
This makes it clearer that this comes from divergence resolution.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 08 May 2020 04:02:22 +0200 |
| parents | 13376ca93fa3 |
| children | e8660b28bfee |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-interrupted.t Thu May 07 07:57:14 2020 -0700 +++ b/tests/test-evolve-content-divergent-interrupted.t Fri May 08 04:02:22 2020 +0200 @@ -197,7 +197,7 @@ merge:[5] added d with: [7] added d base: [4] added d - rebasing "divergent" content-divergent changeset e49523854bc8 on 0194d1974f1a + rebasing "divergent" content-divergent changeset e49523854bc8 on 4566502c0483 merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved