Mercurial > 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, 16 Apr 2007 14:41:21 -0700 |
parents | 06ab90119fa6 |
children | a8cc7fa833a3 |
files | en/examples/rename.divergent.merge.out |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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