# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2007-11-07 20:38:04
# Node ID 305b035c5fdaaca1e686fafd6e1148477db10861
# Parent  2dd399d8a992080b22a2b2b407835347205298f7

Mark failing test as a known bug

diff --git a/tests/test-merge-types.out b/tests/test-merge-types.out
new file mode 100644
--- /dev/null
+++ b/tests/test-merge-types.out
@@ -0,0 +1,1 @@
+### This test is for a known, unfixed bug ###