Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-revert2.out @ 836:1fe3b14c7044

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH
author mpm@selenic.com
date Thu, 04 Aug 2005 13:27:41 -0800
parents 8f5637f0a0c0 ad8ff3534fde
children 9c918287d10b
line wrap: on
line diff
--- a/tests/test-merge-revert2.out
+++ b/tests/test-merge-revert2.out
@@ -44,6 +44,7 @@ M file1
 3aa14bbc23d9+ tip
 + hg revert
 + hg diff
+FIXME: This is a known bug:
 + hg status
 + hg id
 3aa14bbc23d9 tip