hgbook: e281bd9a8e47 en/examples/tour.update.out

hgbook

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 source

1 $ \textbf{grep printf hello.c}

2 printf("hello, world!\textbackslash{}");

3 $ \textbf{hg update tip}

4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

5 $ \textbf{grep printf hello.c}

6 printf("hello, world!\textbackslash{}");

7 printf("hello again!\textbackslash{}n");