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.2
changeset 3001 67b59d1657cf
parent 2798 2280461343e5
parent 3000 bd7e8be29542
child 3003 ddf28837f5af
child 3108 9c9c8c1eeb93 
--- 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
evolve