Mercurial > evolve

diff tests/test-evolve-content-divergent-stack.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 e5d91fd1f319 b3d9e6c805d6
children 8e4f6354b316 4688b7eb7e40
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-stack.t	Thu Jan 21 19:05:17 2021 +0800
+++ b/tests/test-evolve-content-divergent-stack.t	Fri Jan 22 11:04:55 2021 +0100
@@ -576,7 +576,6 @@
   rebasing "divergent" content-divergent changeset c72d2885eb51 on 6c228f1e5409
   rebasing "other" content-divergent changeset d45f050514c2 on 6c228f1e5409
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at c758af982013
   $ hg glog
   o  25:957008d45543 added d
   |   () [default] draft