diff tests/test-evolve-wdir.t @ 6187:df8df57a3ce3 mercurial-5.0

test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 18:21:24 +0300
parents c5dfbbe4363d
children 716912541759
line wrap: on
line diff
--- a/tests/test-evolve-wdir.t	Tue Feb 22 18:14:26 2022 +0300
+++ b/tests/test-evolve-wdir.t	Tue Feb 22 18:21:24 2022 +0300
@@ -149,25 +149,21 @@
   adding Z
   diff --git a/X b/X
   new file mode 100644
-  examine changes to 'X'?
-  (enter ? for help) [Ynesfdaq?] f
+  examine changes to 'X'? [Ynesfdaq?] f
   
   diff --git a/Y b/Y
   new file mode 100644
-  examine changes to 'Y'?
-  (enter ? for help) [Ynesfdaq?] d
+  examine changes to 'Y'? [Ynesfdaq?] d
   
   created new head
   continue splitting? [Ycdq?] y
   diff --git a/Y b/Y
   new file mode 100644
-  examine changes to 'Y'?
-  (enter ? for help) [Ynesfdaq?] f
+  examine changes to 'Y'? [Ynesfdaq?] f
   
   diff --git a/Z b/Z
   new file mode 100644
-  examine changes to 'Z'?
-  (enter ? for help) [Ynesfdaq?] d
+  examine changes to 'Z'? [Ynesfdaq?] d
   
   continue splitting? [Ycdq?] c