Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 1131:a44a26f8cc48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: adapt to change in core rebase Mercurial core changeset 63e889cc610d (And the ones around it) changed the way graft and rebase work. We adapt to them.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 16 Oct 2014 04:38:37 -0700
parents 7068ccfed963
children a1f5a948420d
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Thu Oct 16 14:06:52 2014 -0700
+++ b/tests/test-stabilize-conflict.t	Thu Oct 16 04:38:37 2014 -0700
@@ -143,7 +143,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | @  changeset:   5:71c18f70c34f
+  | o  changeset:   5:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     babar count up to fifteen
@@ -233,7 +233,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | @  changeset:   8:1836b91c6c1d
+  | o  changeset:   8:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     babar count up to fifteen