hgbook

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

find changesets by author, revision, files, or words in the commit message
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
line source
1 $ \textbf{hg merge}
2 merging hello.c
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
4 (branch merge, don't forget to commit)