Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 2701:26ec0839865b mercurial-4.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat: merge with mercurial-4.1
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 02 Jul 2017 17:28:15 +0200
parents 90ab79764ce4 6d48ad81e7b5
children 13c4d518327a
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Sun Jul 02 18:22:39 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Sun Jul 02 17:28:15 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