Mercurial > hgbook
view ja/examples/branch-named.update-bar.out @ 836:d819bc2414f4
add figs/bad-merge-*.dot.
a part of 7226e5e750a6.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Thu, 23 Jul 2009 18:10:58 +0900 |
parents | b0db5adf11c1 |
children |
line wrap: on
line source
$ \textbf{hg update bar} abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes $ \textbf{hg update -C bar} 1 files updated, 0 files merged, 1 files removed, 0 files unresolved