Mercurial > evolve
diff tests/test-evolve-templates.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 e8542915d0f7 |
| children | 011b53a9d03c eed42a183d46 |
line wrap: on
line diff
--- a/tests/test-evolve-templates.t Fri May 08 20:36:28 2020 +0800 +++ b/tests/test-evolve-templates.t Fri May 08 20:36:29 2020 +0800 @@ -302,30 +302,25 @@ adding b diff --git a/a b/a new file mode 100644 - examine changes to 'a'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'a'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +42 - record change 1/2 to 'a'? - (enter ? for help) [Ynesfdaq?] y + record change 1/2 to 'a'? [Ynesfdaq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] n + examine changes to 'b'? [Ynesfdaq?] n created new head continue splitting? [Ycdq?] y diff --git a/b b/b new file mode 100644 - examine changes to 'b'? - (enter ? for help) [Ynesfdaq?] y + examine changes to 'b'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +43 - record this change to 'b'? - (enter ? for help) [Ynesfdaq?] y + record this change to 'b'? [Ynesfdaq?] y no more change to split