--- a/tests/test-fetch.t Sun Sep 26 17:20:24 2010 -0500
+++ b/tests/test-fetch.t Mon Sep 27 10:39:22 2010 -0500
@@ -82,7 +82,7 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:5e056962225c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- new changeset 3:0b6439e938f9 merges remote changes with local
+ new changeset 3:* merges remote changes with local (glob)
$ hg --cwd d tip --template '{desc}\n'
Automated merge with http://localhost:*/ (glob)
@@ -99,7 +99,7 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:5e056962225c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- new changeset 3:0b6439e938f9 merges remote changes with local
+ new changeset 3:* merges remote changes with local (glob)
$ hg --cwd e tip --template '{desc}\n'
Automated merge with http://localhost:*/ (glob)
$ hg clone a f