Mercurial > public > mercurial-scm > hg-stable

diff tests/test-resolve.t @ 26969:b54b520a24c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix globs for Windows
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 15 Nov 2015 21:12:13 -0500
parents 50d2389a2e49
children 1791f9aa782f
line wrap: on
line diff
--- a/tests/test-resolve.t	Sun Nov 15 22:58:28 2015 +0100
+++ b/tests/test-resolve.t	Sun Nov 15 21:12:13 2015 -0500
@@ -201,7 +201,7 @@
 .orig files should exists where specified
   $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
   merging file1
-  creating directory: $TESTTMP/repo/.hg/origbackups
+  creating directory: $TESTTMP/repo/.hg/origbackups (glob)
   merging file2
   warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
   warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')