# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1176759681 25200
# Node ID 8b33c890e777a73828b027326a878304961f4be0
# Parent  06ab90119fa6bd05374a94977c45a6fb158a04d2
Something interesting happened, but I don't have time to look and see.

diff -r 06ab90119fa6 -r 8b33c890e777 en/examples/rename.divergent.merge.out
--- a/en/examples/rename.divergent.merge.out	Mon Apr 16 14:39:51 2007 -0700
+++ b/en/examples/rename.divergent.merge.out	Mon Apr 16 14:41:21 2007 -0700
@@ -7,7 +7,7 @@
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
-1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ \textbf{hg pull ../bob}
 pulling from ../bob
 searching for changes