tests/test-rename-merge1.t
changeset 42182 fad480dad04d
parent 42167 91a0bc50b288
child 42221 c83c08cf02b7
--- a/tests/test-rename-merge1.t	Thu Apr 18 22:08:58 2019 -0700
+++ b/tests/test-rename-merge1.t	Thu Apr 18 22:23:26 2019 -0700
@@ -75,7 +75,7 @@
   $ hg cp b b3
   $ hg cp b b4
   $ hg ci -A -m 'copy b twice'
-  $ hg up eb92d88a9712
+  $ hg up '.^'
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg up
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -87,7 +87,7 @@
   $ hg cp b b3
   $ hg mv b b4
   $ hg ci -A -m 'divergent renames in same changeset'
-  $ hg up c761c6948de0
+  $ hg up '.^'
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg up
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved