Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 3003:ddf28837f5af mercurial-4.0

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.0 compat branch (merging through 4.1 compat branch)
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 01:18:39 +0200
parents 13c4d518327a 67b59d1657cf
children 50be10c63825
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Tue Jul 25 15:17:52 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Wed Sep 27 01:18:39 2017 +0200
@@ -160,7 +160,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