Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 3001:67b59d1657cf mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat-test: merge future 6.7.0 into 4.2 compat branch Couple feature to disable and other various test impact.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 01:07:22 +0200
parents 2280461343e5 bd7e8be29542
children ddf28837f5af 9c9c8c1eeb93
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Tue Jul 25 15:17:17 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Wed Sep 27 01:07:22 2017 +0200
@@ -161,7 +161,7 @@
   
 (fix the conflict and continue)
 
-  $ hg revert -r 5 --all
+  $ hg revert -r 71c18f70c34f --all
   reverting babar
   $ safesed 's/dix/ten/' babar
   $ hg resolve --all -m