Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-stabilize-conflict.t
branchmercurial-4.0
changeset 3003 ddf28837f5af
parent 2800 13c4d518327a
parent 3001 67b59d1657cf
child 3110 50be10c63825 
--- 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
evolve