hgbook

diff en/examples/tour.merge.merge.out @ 298:2b8c6aa370d5

find changesets by author, revision, files, or words in the commit message
Fix sample output for test 'branch-repo'.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 21:54:18 2008 +0200 (2008-08-20)
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	Wed Aug 20 21:54:18 2008 +0200
     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)