diff tests/test-uncommit.t @ 929:306f67906a6c stable

merge with all other change to 3.3
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 11 May 2014 01:17:02 -0700
parents 89b50258ad33
children c768f7666106
line wrap: on
line diff
--- a/tests/test-uncommit.t	Sun May 11 01:14:34 2014 -0700
+++ b/tests/test-uncommit.t	Sun May 11 01:17:02 2014 -0700
@@ -316,7 +316,7 @@
 
   $ hg uncommit e
   new changeset is empty
-  (use "hg kill ." to remove it)
+  (use "hg prune ." to remove it)
   $ hg debugobsolete
   5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 {'date': '* *', 'user': 'test'} (glob)
   5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 {'date': '* *', 'user': 'test'} (glob)