hgbook

view en/examples/tour.merge.update.out @ 167:e67251ac336f

Small portability change. "grep -P" doesn't work on Debian.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 27 01:15:34 2007 -0500 (2007-03-27)
parents
children 1b52bda675d0
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes