Mercurial > evolve

comparison tests/test-evolve-content-divergent-first-changeset.t @ 5297:a73cdef2e33f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 83ceafbaa7d6
comparison
equal deleted inserted replaced
5296:142827ad86f3 5297:a73cdef2e33f
39 $ hg evolve --content-divergent --tool :other 39 $ hg evolve --content-divergent --tool :other
40 merge:[1] div1 40 merge:[1] div1
41 with: [2] div2 41 with: [2] div2
42 base: [0] test 42 base: [0] test
43 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 43 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
44 working directory is now at 3b448ec6f793 44 working directory is now at 62fcb3488421
45 45
46 $ hg evolve --list 46 $ hg evolve --list