diff -r 8b09b0864781 -r 369ddc9c0339 tests/test-log.out
--- a/tests/test-log.out	Wed Jun 25 12:53:57 2008 -0700
+++ b/tests/test-log.out	Wed Jun 25 17:33:34 2008 -0500
@@ -150,7 +150,6 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % log -r . with two parents
-warning: working directory has two parents, tag '.' uses the first
 changeset:   3:e62f78d544b4
 parent:      1:3d5bf5654eda
 user:        test