Mercurial > hg

diff tests/test-graft.t @ 22897:8fe74328f700

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: merge falls through to otherparent This lets us more correctly fix the state when we use setparents, as demonstrated in the change in test-graft.t.
author Matt Mackall <mpm@selenic.com>
date Sat, 11 Oct 2014 14:05:09 -0500
parents bdc0e04df243
children a3c2d9211294
line wrap: on
line diff
--- a/tests/test-graft.t	Fri Oct 10 13:31:06 2014 -0500
+++ b/tests/test-graft.t	Sat Oct 11 14:05:09 2014 -0500
@@ -92,7 +92,7 @@
   HG: --
   HG: user: foo
   HG: branch 'default'
-  HG: changed b
+  HG: added b
   HG: removed a
   $ hg export tip --git
   # HG changeset patch