Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-conflicts.t @ 12640:6cc4b14fb76b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 08 Oct 2010 22:36:10 -0500
parents 16b854cb80f1
children b19b4c1df066
line wrap: on
line diff
--- 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'