Mercurial > evolve
diff tests/test-evolve-obshistory-lots-of-splits.t @ 4362:8bd60e09dfb4 mercurial-4.5
test-compat: merge mercurial-4.6 into mercurial-4.5
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:55:09 -0500 |
| parents | f3713d41b85b 522abf1d70b7 |
| children | a2fdbece7ce1 ef1c322c389d |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-lots-of-splits.t Mon Dec 24 17:47:29 2018 +0100 +++ b/tests/test-evolve-obshistory-lots-of-splits.t Tue Jan 22 12:55:09 2019 -0500 @@ -43,16 +43,16 @@ > n > n > n - > n + > y > y > y > n > n - > n + > y > y > y > n - > n + > y > y > y > EOF @@ -82,7 +82,7 @@ examine changes to 'd'? [Ynesfdaq?] n created new head - Done splitting? [yN] n + continue splitting? [Ycdq?] y diff --git a/b b/b new file mode 100644 examine changes to 'b'? [Ynesfdaq?] y @@ -99,7 +99,7 @@ new file mode 100644 examine changes to 'd'? [Ynesfdaq?] n - Done splitting? [yN] n + continue splitting? [Ycdq?] y diff --git a/c b/c new file mode 100644 examine changes to 'c'? [Ynesfdaq?] y @@ -112,7 +112,7 @@ new file mode 100644 examine changes to 'd'? [Ynesfdaq?] n - Done splitting? [yN] n + continue splitting? [Ycdq?] y diff --git a/d b/d new file mode 100644 examine changes to 'd'? [Ynesfdaq?] y