hgbook

view en/examples/tour.merge.merge.out @ 500:77e6cd1e0a93

find changesets by author, revision, files, or words in the commit message
Fixing accents on mq-ref.tex that avoided compilation
author Igor Támara <igor@tamarapatino.org>
date Sat Jan 10 23:09:47 2009 -0500 (2009-01-10)
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)