Mercurial > hgbook
view en/examples/backout.manual.merge.out @ 179:5fc4a45c069f
Continue documentation of collaboration models.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 30 Mar 2007 23:05:28 -0700 |
parents | 006bbad1f190 |
children |
line wrap: on
line source
$ \textbf{hg merge} merging myfile 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ \textbf{hg commit -m 'merged backout with previous tip'} $ \textbf{cat myfile} first change third change