Mercurial > hgbook
view en/examples/tour.merge.update.out @ 414:635d7c0fcac3
Merge
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 26 Aug 2008 14:06:41 -0700 |
parents | 1b52bda675d0 |
children |
line wrap: on
line source
$ \textbf{hg update} abort: crosses branches (use 'hg merge' or 'hg update -C')