Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-revert.out @ 894:62ec665759f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 13 Aug 2005 15:23:06 -0800
parents 9c918287d10b 6d6095823b82
children 77b52b864249
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