tests/test-merge3.out
changeset 1747 91c56c427171
parent 925 5a034646e472
--- a/tests/test-merge3.out	Sat Feb 18 16:31:02 2006 +0100
+++ b/tests/test-merge3.out	Sat Feb 18 07:37:59 2006 -0800
@@ -1,3 +1,2 @@
 removing b
-b never committed!
 nothing changed