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-narrow-rebase.t
changeset 45150 dc5e5577af39
parent 42613 35ebdbb38efb
child 45771 f90a5c211251 
--- a/tests/test-narrow-rebase.t	Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-narrow-rebase.t	Mon Jul 13 16:42:44 2020 -0700
@@ -72,7 +72,7 @@
   $ hg rebase -d 'desc("modify inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)'
   rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip)
   merging inside/f1
-  unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   $ echo modified3 > inside/f1
   $ hg resolve -m 2>&1 | grep -v continue:
   (no more unresolved files)
mercurial