diff tests/test-obsolete.t @ 626:896463193675 stable

merge with fix in 2.3
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Mon, 03 Dec 2012 15:11:09 +0100
parents 7f89b31fcb26 07d813af96c4
children ca5459892427
line wrap: on
line diff
--- a/tests/test-obsolete.t	Tue Nov 27 14:27:50 2012 +0100
+++ b/tests/test-obsolete.t	Mon Dec 03 15:11:09 2012 +0100
@@ -376,7 +376,6 @@
   commit: 1 deleted, 2 unknown (clean)
   update: 4 new changesets, 4 branch heads (merge)
   unstable: 1 changesets
-  divergent: 1 changesets
   $ qlog
   6
   - 909a0fb57e5d