diff tests/test-split.t @ 4577:bcd52ce0916d

evolve: don't update after instability resolution by default (BC)
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 24 Apr 2019 15:59:02 +0200
parents 96ce1030d2fb
children 30a544904238
line wrap: on
line diff
--- a/tests/test-split.t	Sun Apr 14 02:18:19 2019 +0800
+++ b/tests/test-split.t	Wed Apr 24 15:59:02 2019 +0200
@@ -1139,11 +1139,10 @@
   $ hg evolve -r 2
   move:[2] c
   atop:[3] split1
-  working directory is now at 21a63bd6ee88
   $ hg glog
-  @  5:21a63bd6ee88 c (draft)
+  o  5:21a63bd6ee88 c (draft)
   |
-  o  3:88437e073cd4 split1 (draft)
+  @  3:88437e073cd4 split1 (draft)
   |
   o  0:a5a1faba8d26 p (draft)