diff tests/test-obsolete-push.t @ 1698:dd6f090b7342 mercurial-3.5

merge with stable throug 3.6 branch
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 06 May 2016 00:00:14 +0200
parents 7463f5880ce9
children f4047fba5e90
line wrap: on
line diff
--- a/tests/test-obsolete-push.t	Thu Feb 11 00:07:54 2016 +0000
+++ b/tests/test-obsolete-push.t	Fri May 06 00:00:14 2016 +0200
@@ -25,7 +25,7 @@
   $ echo c > c
   $ hg ci -qAm C c
   $ hg phase --secret --force .
-  $ hg kill 0 1
+  $ hg prune 0 1
   2 changesets pruned
   1 new unstable changesets
   $ glog --hidden