Mercurial > hgbook

view ja/examples/branch-repo.merge.out @ 788:b3c384b30e11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added tag finished draft translation for changeset ec889c068d46
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sun, 07 Jun 2009 20:28:35 +0900
parents b0db5adf11c1
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