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 12640 6cc4b14fb76b
parent 12608 16b854cb80f1
child 12896 b19b4c1df066 
--- a/tests/test-rebase-conflicts.t	Fri Oct 08 22:36:10 2010 -0500
+++ b/tests/test-rebase-conflicts.t	Fri Oct 08 22:36:10 2010 -0500
@@ -73,7 +73,7 @@
   $ echo 'resolved merge' >common
   $ hg resolve -m common
   $ hg rebase --continue
-  saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  5: 'L3'
mercurial