Mercurial > evolve
diff tests/test-evolve-obshistory-split.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 a34b5cf906c6 |
| children | 15406dfa60e1 c2c85576ddfb |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-split.t Sat Oct 31 19:10:55 2020 +0800 +++ b/tests/test-evolve-obshistory-split.t Sat Oct 31 19:33:42 2020 +0800 @@ -46,30 +46,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