hgbook

diff en/examples/tour.update.out @ 302:e281bd9a8e47

find changesets by author, revision, files, or words in the commit message
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 22:00:46 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.update.out	Wed Aug 20 22:00:46 2008 +0200
     1.3 @@ -0,0 +1,7 @@
     1.4 +$ \textbf{grep printf hello.c}
     1.5 +	printf("hello, world!\textbackslash{}");
     1.6 +$ \textbf{hg update tip}
     1.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     1.8 +$ \textbf{grep printf hello.c}
     1.9 +	printf("hello, world!\textbackslash{}");
    1.10 +	printf("hello again!\textbackslash{}n");