Mercurial > evolve

diff tests/test-topic-stack.t @ 5235:90fbbc29b93a mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 08 Apr 2020 01:16:54 +0800
parents e5fe3ca5e6ad
children 58b225aa4298 e6e92835d42d
line wrap: on
line diff
--- a/tests/test-topic-stack.t	Wed Apr 08 01:16:53 2020 +0800
+++ b/tests/test-topic-stack.t	Wed Apr 08 01:16:54 2020 +0800
@@ -940,18 +940,15 @@
   adding ggg
   diff --git a/Z b/Z
   new file mode 100644
-  examine changes to 'Z'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'Z'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +zzz
-  record change 1/2 to 'Z'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'Z'? [Ynesfdaq?] y
   
   diff --git a/ggg b/ggg
   new file mode 100644
-  examine changes to 'ggg'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'ggg'? [Ynesfdaq?] n
   
   continue splitting? [Ycdq?] c