view ja/examples/tour.merge.update.out @ 796:5cb09396dc35

add auto-snippets.xml
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 18 Jun 2009 16:41:21 +0900
parents b0db5adf11c1
children
line wrap: on
line source

$ \textbf{hg update}
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes