hgbook

diff en/examples/tour.merge.merge.out @ 548:5ffee9123bbf

find changesets by author, revision, files, or words in the commit message
Fix most remaining examples
author Bryan O'Sullivan <bos@serpentine.com>
date Thu Jan 29 22:46:56 2009 -0800 (2009-01-29)
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	Thu Jan 29 22:46:56 2009 -0800
     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)