hgbook

diff en/examples/branch-repo.merge.out @ 472:6880f9c8e7e7

find changesets by author, revision, files, or words in the commit message
Automated merge with http://mercurial.intuxication.org/hg/mercurial_book_es
author Igor Támara <igor@tamarapatino.org>
date Sun Dec 28 00:30:26 2008 -0500 (2008-12-28)
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	Sun Dec 28 00:30:26 2008 -0500
     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