Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-revert.out @ 895:77b52b864249

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge walk changes with Matt's tip.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 13 Aug 2005 15:26:32 -0800
parents 9c918287d10b 62ec665759f2
children 01215ad04283
line wrap: on
line diff
--- a/tests/test-merge-revert.out
+++ b/tests/test-merge-revert.out
@@ -26,7 +26,6 @@ 3aa14bbc23d9 tip
 + hg update
 merging file1
 + hg diff
-FIXME: This is a known bug:
 + hg status
 + hg id
 3aa14bbc23d9 tip