# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1360789783 21600
# Node ID c161e4cf77d4d4997c853d00e5b3117d6d5d8f72
# Parent  a343eccd5ee2d44715be7b0dade7c01c20507adc# Parent  f6f35d646cb5919997d3a23b942594def5d9e243
merge with stable

diff -r a343eccd5ee2 -r c161e4cf77d4 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Wed Feb 13 21:51:47 2013 +0100
+++ b/tests/test-obsolete.t	Wed Feb 13 15:09:43 2013 -0600
@@ -816,7 +816,7 @@
      summary:     A
   
   $ hg incoming
-  comparing with $TESTTMP/tmpe/repo-issue3805
+  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
   searching for changes
   changeset:   2:3816541e5485
   tag:         tip
@@ -826,7 +826,7 @@
   summary:     A
   
   $ hg incoming --bundle ../issue3805.hg
-  comparing with $TESTTMP/tmpe/repo-issue3805
+  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
   searching for changes
   changeset:   2:3816541e5485
   tag:         tip
@@ -836,7 +836,7 @@
   summary:     A
   
   $ hg outgoing
-  comparing with $TESTTMP/tmpe/repo-issue3805
+  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
   searching for changes
   no changes found
   [1]