Mercurial > hgbook

view en/examples/branch-repo.merge.out @ 563:951bf84ca8e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
translated up to the section "testing and troubleshooting"
author Javier Rojas <jerojasro@devnull.li>
date Tue, 23 Dec 2008 18:57:35 -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