tests/test-obsolete.t
branchmercurial-4.1
changeset 2799 1627153804dc
parent 2700 52d5c5ce27e4
parent 2798 2280461343e5
child 2800 13c4d518327a
child 3002 00e4d31b8cdb
--- a/tests/test-obsolete.t	Tue Jul 25 03:41:15 2017 +0200
+++ b/tests/test-obsolete.t	Tue Jul 25 03:59:22 2017 +0200
@@ -10,6 +10,7 @@
   > debugobsolete=debugobsolete -d '0 0'
   > [extensions]
   > hgext.rebase=
+  > color =
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ mkcommit() {
@@ -274,7 +275,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  (run 'hg heads .' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   6
   - 909a0fb57e5d
@@ -364,7 +365,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  (run 'hg heads .' to see heads, 'hg merge' to merge)
 
   $ hg up -q 7 # to check rollback update behavior
   $ qlog