--- a/tests/test-merge-revert.out Sat Aug 13 15:13:37 2005 -0800 +++ b/tests/test-merge-revert.out Sat Aug 13 15:23:06 2005 -0800 @@ -26,7 +26,6 @@ + hg update merging file1 + hg diff -FIXME: This is a known bug: + hg status + hg id 3aa14bbc23d9 tip