diff tests/test-rewind.t @ 5637:eed42a183d46 mercurial-5.0

test-compat: merge mercurial-5.1 into mercurial-5.0 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 31 Oct 2020 19:33:42 +0800
parents e6e92835d42d ba8bc1b0acd2
children 1dd861f4608c c2c85576ddfb
line wrap: on
line diff
--- a/tests/test-rewind.t	Sat Oct 31 19:10:55 2020 +0800
+++ b/tests/test-rewind.t	Sat Oct 31 19:33:42 2020 +0800
@@ -517,18 +517,15 @@
   adding D
   diff --git a/C b/C
   new file mode 100644
-  examine changes to 'C'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'C'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +C
-  record change 1/2 to 'C'?
-  (enter ? for help) [Ynesfdaq?] f
+  record change 1/2 to 'C'? [Ynesfdaq?] f
   
   diff --git a/D b/D
   new file mode 100644
-  examine changes to 'D'?
-  (enter ? for help) [Ynesfdaq?] d
+  examine changes to 'D'? [Ynesfdaq?] d
   
   created new head
   continue splitting? [Ycdq?] c