view en/examples/branch-repo.merge.out @ 499:f89ee6f63ea2

Archivo to Fichero and update Leame.1st
author Igor TAmara <igor@tamarapatino.org>
date Thu, 06 Nov 2008 23:09:47 -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