Mercurial > evolve
diff tests/test-stabilize-result.t @ 1700:05d7df73a56b mercurial-3.4
merge with stable through 3.5 branch
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Fri, 06 May 2016 00:08:31 +0200 |
parents | e359d33856c3 dd6f090b7342 |
children | bc590681de77 |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Fri May 06 00:03:28 2016 +0200 +++ b/tests/test-stabilize-result.t Fri May 06 00:08:31 2016 +0200 @@ -367,6 +367,6 @@ /!\ * hg up to the parent of the amended changeset (which are named W and Z) /!\ * hg revert --all -r X /!\ * hg ci -m "same message as the amended changeset" => new cset Y - /!\ * hg kill -n Y W Z + /!\ * hg prune -n Y W Z ) [255]