hgbook
view en/examples/tour.log-vp.out @ 302:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
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{hg log -v -p -r 2}
2 changeset:
3 user: Bryan O'Sullivan <bos@serpentine.com>
5 files: hello.c
6 description:
7 Introduce a typo into hello.c.
10 diff -r -r hello.c
13 @@ -11,6 +11,6 @@
15 int main(int argc, char **argv)
16 \{
17 - printf("hello, world!\textbackslash{}n");
18 + printf("hello, world!\textbackslash{}");
19 return 0;
20 \}