--- a/tests/test-merge-revert.out Tue Aug 09 11:32:30 2005 +0100 +++ b/tests/test-merge-revert.out Wed Aug 10 06:47:46 2005 +0100 @@ -26,7 +26,6 @@ + hg update merging file1 + hg diff -FIXME: This is a known bug: + hg status + hg id 3aa14bbc23d9 tip