--- a/tests/test-merge-revert.out Thu Aug 04 18:06:49 2005 +0100 +++ b/tests/test-merge-revert.out Thu Aug 04 18:13:17 2005 +0100 @@ -26,6 +26,7 @@ + hg update merging file1 + hg diff +FIXME: This is a known bug: + hg status + hg id 3aa14bbc23d9 tip