--- a/tests/test-merge-revert.out Thu Aug 04 13:25:59 2005 -0800 +++ b/tests/test-merge-revert.out Thu Aug 04 13:27:41 2005 -0800 @@ -26,6 +26,7 @@ + hg update merging file1 + hg diff +FIXME: This is a known bug: + hg status + hg id 3aa14bbc23d9 tip