Mercurial > hgbook

view en/examples/branch-repo.merge.out @ 492:2c2c86824c61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
began translation of the "behind the scenes" chapter
author Javier Rojas <jerojasro@devnull.li>
date Mon, 03 Nov 2008 21:00:32 -0500
parents 58e3a6c76725
children
line wrap: on
line source

$ \textbf{hg merge}
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'}
$ \textbf{hg push}
pushing to 
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files