tests/test-stabilize-conflict.t
changeset 895 17ac69db9329
parent 742 760d01a549a6
child 964 c768f7666106
child 1026 35adaf02b777
--- a/tests/test-stabilize-conflict.t	Fri Apr 04 00:30:56 2014 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Apr 04 00:58:15 2014 +0200
@@ -59,6 +59,7 @@
 ----------------------------------
 
   $ hg gdown
+  gdown have been deprecated in favor of previous
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   [1] babar count up to ten
   $ safesed 's/huit/eight/' babar
@@ -105,6 +106,7 @@
 --------------------------------------------------
 
   $ hg gdown
+  gdown have been deprecated in favor of previous
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   [4] babar count up to ten
   $ safesed 's/dix/ten/' babar
@@ -189,6 +191,7 @@
   $ safesed 's/merge=.*/merge=touch/' $HGRCPATH
   $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH
   $ hg gdown
+  gdown have been deprecated in favor of previous
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   [7] babar count up to ten
   $ safesed 's/ten/zehn/' babar