hgbook

diff en/examples/branch-repo.merge.out @ 212:ef8a5e393103

find changesets by author, revision, files, or words in the commit message
Mention the paths section of a hgwebdir config file.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed May 09 14:35:23 2007 -0700 (2007-05-09)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/branch-repo.merge.out	Wed May 09 14:35:23 2007 -0700
     1.3 @@ -0,0 +1,11 @@
     1.4 +$ \textbf{hg merge}
     1.5 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     1.6 +(branch merge, don't forget to commit)
     1.7 +$ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'}
     1.8 +$ \textbf{hg push}
     1.9 +pushing to 
    1.10 +searching for changes
    1.11 +adding changesets
    1.12 +adding manifests
    1.13 +adding file changes
    1.14 +added 2 changesets with 1 changes to 1 files