diff tests/test-rewind.t @ 5314:e6e92835d42d mercurial-5.0

test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 May 2020 20:36:29 +0800
parents e5fe3ca5e6ad e8660b28bfee
children eed42a183d46
line wrap: on
line diff
--- a/tests/test-rewind.t	Fri May 08 20:36:28 2020 +0800
+++ b/tests/test-rewind.t	Fri May 08 20:36:29 2020 +0800
@@ -503,18 +503,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