diff -r ca58f6475f1d -r 4134686b83e1 tests/test-filebranch.t --- a/tests/test-filebranch.t Thu Sep 16 16:12:26 2010 -0500 +++ b/tests/test-filebranch.t Thu Sep 16 17:51:32 2010 -0500 @@ -41,6 +41,7 @@ We shouldn't have anything but n state here: $ hg debugstate --nodates | grep -v "^n" + [1] Merging: