merge with stable
authorKevin Bullock <kbullock@ringworld.org>
Wed, 13 Feb 2013 15:09:43 -0600
changeset 18684 c161e4cf77d4
parent 18683 a343eccd5ee2 (current diff)
parent 18679 f6f35d646cb5 (diff)
child 18685 fafdff7e9c43
merge with stable
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]