Mercurial > evolve
diff tests/test-rewind.t @ 4360:522abf1d70b7 mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 22 Jan 2019 12:54:44 -0500 |
parents | 8974a05a49fa |
children | a2fdbece7ce1 96ce1030d2fb |
line wrap: on
line diff
--- a/tests/test-rewind.t Mon Dec 24 17:47:28 2018 +0100 +++ b/tests/test-rewind.t Tue Jan 22 12:54:44 2019 -0500 @@ -460,7 +460,7 @@ > y > f > d - > y + > c > EOF 0 files updated, 0 files merged, 2 files removed, 0 files unresolved adding C @@ -478,7 +478,7 @@ examine changes to 'D'? [Ynesfdaq?] d created new head - Done splitting? [yN] y + continue splitting? [Ycdq?] c $ hg log -G @ changeset: 5:9576e80d6851 | tag: tip