# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1122134892 -3600
# Node ID 8162ff905b331333f0d629367cb5b9ddc9acec34
# Parent  b3820ce0e88ab83286fbe838162d1777c63b7b00
Fixed test to notice .out file generated by run-test.


diff -r b3820ce0e88a -r 8162ff905b33 tests/test-merge3.out
--- a/tests/test-merge3.out	Sat Jul 23 10:14:42 2005 -0500
+++ b/tests/test-merge3.out	Sat Jul 23 17:08:12 2005 +0100
@@ -6,5 +6,6 @@
 + hg add b
 + rm b
 + hg commit -A '-mcomment #1' -d '0 0'
+adding .out
 removing b
 b never committed!