Mercurial > hgbook
view en/examples/branch-repo.merge.out @ 533:c847605eb2a9
translated a bit, will stop translating this file until I figure out how to translate the expression "case sensitivity"
author | jerojasro@localhost |
---|---|
date | Mon, 01 Dec 2008 20:56:29 -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