--- a/tests/test-conflict.t Sun Dec 06 14:45:19 2020 +0100 +++ b/tests/test-conflict.t Tue Dec 08 13:33:40 2020 -0800 @@ -80,6 +80,8 @@ } ] + $ hg status -0 + M a\x00? a.orig\x00 (no-eol) (esc) $ cat a Small Mathematical Series. 1