Mercurial Mercurial > mercurial / 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-histedit-non-commute-abort.t
changeset 27629 e7ff83b2bcfe
parent 27405 5837ca674da9
child 28004 34165875fa5d 
--- a/tests/test-histedit-non-commute-abort.t	Wed Dec 23 08:52:52 2015 +0000
+++ b/tests/test-histedit-non-commute-abort.t	Wed Dec 23 08:57:04 2015 +0000
@@ -72,7 +72,8 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
-  Fix up the change and run hg histedit --continue
+  Fix up the change (pick e860deea161a)
+  (hg histedit --continue to resume)
 
 insert unsupported advisory merge record
   $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
mercurial