hgbook
changeset 193:8b33c890e777
Something interesting happened, but I don't have time to look and see.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Apr 16 14:41:21 2007 -0700 (2007-04-16) |
parents | 06ab90119fa6 |
children | a8cc7fa833a3 |
files | en/examples/rename.divergent.merge.out |
line diff
1.1 --- a/en/examples/rename.divergent.merge.out Mon Apr 16 14:39:51 2007 -0700 1.2 +++ b/en/examples/rename.divergent.merge.out Mon Apr 16 14:41:21 2007 -0700 1.3 @@ -7,7 +7,7 @@ 1.4 adding manifests 1.5 adding file changes 1.6 added 1 changesets with 1 changes to 1 files 1.7 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1.8 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.9 $ \textbf{hg pull ../bob} 1.10 pulling from ../bob 1.11 searching for changes