diff -r aeb2812f304d -r 7e99b02768ef tests/test-filebranch.t --- a/tests/test-filebranch.t Fri Sep 21 00:37:03 2018 -0400 +++ b/tests/test-filebranch.t Thu Sep 20 21:35:01 2018 -0700 @@ -41,7 +41,7 @@ We shouldn't have anything but n state here: - $ hg debugstate --nodates | grep -v "^n" + $ hg debugstate --no-dates | grep -v "^n" [1] Merging: