Mercurial > evolve
diff tests/test-evolve-issue5966.t @ 5722:61d2f1cf90f0
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 |
line wrap: on
line diff
--- a/tests/test-evolve-issue5966.t Thu Jan 21 19:05:17 2021 +0800 +++ b/tests/test-evolve-issue5966.t Fri Jan 22 11:04:55 2021 +0100 @@ -92,7 +92,6 @@ R a $ hg evolve --continue evolving 2:34a690fcf6ab "banana" - working directory is now at 581a2bb4704c $ hg resolve --list evolve the rest of the stack