# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1180206292 25200
# Node ID 50223e198614bd891b6dd1394912a322d53aaee2
# Parent  9be45345065a454691fac816104efe0471eafa00
Update output.

diff -r 9be45345065a -r 50223e198614 en/examples/rename.divergent.merge.out
--- a/en/examples/rename.divergent.merge.out	Sat May 26 12:00:09 2007 -0700
+++ b/en/examples/rename.divergent.merge.out	Sat May 26 12:04:52 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, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ \textbf{hg pull ../bob}
 pulling from ../bob
 searching for changes