hgbook

view en/examples/tour.merge.merge.out @ 471:2449d5d3298e

find changesets by author, revision, files, or words in the commit message
updated template translation percentage
author Igor Támara <igor@tamarapatino.org>
date Sun Dec 28 00:30:00 2008 -0500 (2008-12-28)
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)