Mercurial > hg-stable

diff tests/test-rebase-scenario-global.t @ 22895:dfa44e25bb53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: properly clean-up some more merge state on setparents
author Matt Mackall <mpm@selenic.com>
date Fri, 10 Oct 2014 13:05:50 -0500
parents 4dd9f606d0a6
children 57d35d3c1cf1
line wrap: on
line diff
--- a/tests/test-rebase-scenario-global.t	Tue Oct 07 11:42:37 2014 -0700
+++ b/tests/test-rebase-scenario-global.t	Fri Oct 10 13:05:50 2014 -0500
@@ -59,7 +59,7 @@
   HG: --
   HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com>
   HG: branch 'default'
-  HG: changed D
+  HG: added D
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog