Mercurial > evolve

comparison tests/test-evolve-issue5966.t @ 5722:61d2f1cf90f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge stable into default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 22 Jan 2021 11:04:55 +0100
parents ed7ff9c0a940 a4e50b74747e
children 8e4f6354b316
comparison
equal deleted inserted replaced
5705:9f8ff149f258 5722:61d2f1cf90f0
90 continue: hg evolve --continue 90 continue: hg evolve --continue
91 $ hg resolve --list 91 $ hg resolve --list
92 R a 92 R a
93 $ hg evolve --continue 93 $ hg evolve --continue
94 evolving 2:34a690fcf6ab "banana" 94 evolving 2:34a690fcf6ab "banana"
95 working directory is now at 581a2bb4704c
96 $ hg resolve --list 95 $ hg resolve --list
97 96
98 evolve the rest of the stack 97 evolve the rest of the stack
99 98
100 $ hg evolve 99 $ hg evolve