--- a/tests/test-resolve.t Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-resolve.t Sun Dec 10 22:50:57 2017 -0500
@@ -249,7 +249,7 @@
.orig files should exists where specified
$ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
merging file1
- creating directory: $TESTTMP/repo/.hg/origbackups (glob)
+ creating directory: $TESTTMP/repo/.hg/origbackups
merging file2
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
@@ -270,7 +270,7 @@
test .orig behavior with resolve
$ hg resolve -q file1 --tool "sh -c 'f --dump \"$TESTTMP/repo/file1.orig\"'"
- $TESTTMP/repo/file1.orig: (glob)
+ $TESTTMP/repo/file1.orig:
>>>
foo
baz