comparison en/examples/rename.divergent.merge.out @ 228:50223e198614

Update output.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 26 May 2007 12:04:52 -0700
parents 8b33c890e777
children 00f69e8825c5
comparison
equal deleted inserted replaced
227:9be45345065a 228:50223e198614
5 searching for changes 5 searching for changes
6 adding changesets 6 adding changesets
7 adding manifests 7 adding manifests
8 adding file changes 8 adding file changes
9 added 1 changesets with 1 changes to 1 files 9 added 1 changesets with 1 changes to 1 files
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 10 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
11 $ \textbf{hg pull ../bob} 11 $ \textbf{hg pull ../bob}
12 pulling from ../bob 12 pulling from ../bob
13 searching for changes 13 searching for changes
14 adding changesets 14 adding changesets
15 adding manifests 15 adding manifests