Mercurial > hgbook
view ja/examples/branching.update.out @ 802:de4142983445
Propagate 3b640272a966
Progres on resolve
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sun, 21 Jun 2009 09:20:47 +0900 |
parents | b0db5adf11c1 |
children |
line wrap: on
line source
$ \textbf{cd ..} $ \textbf{hg clone -U main main-old} $ \textbf{cd main-old} $ \textbf{hg update v1.0} 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ \textbf{cat myfile} This is a boring feature.