# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1200926520 -3600
# Node ID 14bc18df0c2541b45407f0356af29a69652240ab
# Parent  e22f9b4435211895b8b18ccac92c2128f588180b# Parent  26d15eea99dba6870842ca5b03840665d53be7bd
merge

diff -r e22f9b443521 -r 14bc18df0c25 doc/test.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/test.txt	Mon Jan 21 15:42:00 2008 +0100
@@ -0,0 +1,1 @@
+test text
\ No newline at end of file