Mercurial > hgbook
diff 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 |
line wrap: on
line diff
--- 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