hgbook

diff en/examples/rename.divergent.merge.out @ 198:615f3c6b30e1

find changesets by author, revision, files, or words in the commit message
Start to describe branch management.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Apr 16 17:21:38 2007 -0700 (2007-04-16)
parents 91a936be78b8
children 50223e198614
line diff
     1.1 --- a/en/examples/rename.divergent.merge.out	Mon Mar 12 23:11:26 2007 -0700
     1.2 +++ b/en/examples/rename.divergent.merge.out	Mon Apr 16 17:21:38 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