Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 3110:50be10c63825 mercurial-4.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge with mercurial-4.1 branch
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 18:43:55 +0200
parents 9c9c8c1eeb93 ddf28837f5af
children 088ea9b74e47
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Fri Oct 20 18:41:05 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Oct 20 18:43:55 2017 +0200
@@ -145,7 +145,6 @@
   | o  changeset:   5:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     babar count up to fifteen
   | |
   | x  changeset:   4:5977072d13c5
@@ -236,7 +235,6 @@
   | o  changeset:   8:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
   | |  summary:     babar count up to fifteen
   | |
   | x  changeset:   7:e04690b09bc6