hgbook

view en/examples/tour.merge.update.out @ 226:eef2171243e8

Document the extdiff extension.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat May 26 11:52:18 2007 -0700 (2007-05-26)
parents
children 1b52bda675d0
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes