diff --git a/tests/test-merge-revert.out b/tests/test-merge-revert.out --- a/tests/test-merge-revert.out +++ b/tests/test-merge-revert.out @@ -26,6 +26,7 @@ 3aa14bbc23d9 tip + hg update merging file1 + hg diff +FIXME: This is a known bug: + hg status + hg id 3aa14bbc23d9 tip