hgbook

diff en/examples/tour.merge.pull.out @ 305:ef34f7bec749

find changesets by author, revision, files, or words in the commit message
Fix sample output for 'extdiff' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 22:04:41 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.pull.out	Wed Aug 20 22:04:41 2008 +0200
     1.3 @@ -0,0 +1,8 @@
     1.4 +$ \textbf{hg pull ../my-hello}
     1.5 +pulling from ../my-hello
     1.6 +searching for changes
     1.7 +adding changesets
     1.8 +adding manifests
     1.9 +adding file changes
    1.10 +added 1 changesets with 1 changes to 1 files (+1 heads)
    1.11 +(run 'hg heads' to see heads, 'hg merge' to merge)