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-rebase-conflicts.t
changeset 23516 328afbad6e57
parent 21947 b081decd9062
child 23517 4f18e80d9c30 
--- a/tests/test-rebase-conflicts.t	Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-conflicts.t	Sun Dec 07 20:04:45 2014 +0100
@@ -79,7 +79,7 @@
   $ hg resolve -m common
   (no more unresolved files)
   $ hg rebase --continue
-  saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-backup.hg (glob)
 
   $ hg tglog
   @  5:secret 'L3'  mybook
mercurial