hgbook

diff en/examples/tour.merge.merge.out @ 480:4e2ebef2c9a4

find changesets by author, revision, files, or words in the commit message
corrected some typos
author Javier Rojas <jerojasro@devnull.li>
date Sun Jan 04 23:04:06 2009 -0500 (2009-01-04)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/tour.merge.merge.out	Sun Jan 04 23:04:06 2009 -0500
     1.3 @@ -0,0 +1,4 @@
     1.4 +$ \textbf{hg merge}
     1.5 +merging hello.c
     1.6 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
     1.7 +(branch merge, don't forget to commit)