hgbook

diff en/examples/tour.log-vp.out @ 356:0db175abfaf3

some friggin' merge or something like that.
author jerojasro@localhost
date Tue Oct 21 22:41:51 2008 -0500 (2008-10-21)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/tour.log-vp.out	Tue Oct 21 22:41:51 2008 -0500
     1.3 @@ -0,0 +1,21 @@
     1.4 +$ \textbf{hg log -v -p -r 2}
     1.5 +changeset:   
     1.6 +user:        Bryan O'Sullivan <bos@serpentine.com>
     1.7 +
     1.8 +files:       hello.c
     1.9 +description:
    1.10 +Introduce a typo into hello.c.
    1.11 +
    1.12 +
    1.13 +diff -r  -r  hello.c
    1.14 +
    1.15 +
    1.16 +@@ -11,6 +11,6 @@
    1.17 + 
    1.18 + int main(int argc, char **argv)
    1.19 + \{
    1.20 +-	printf("hello, world!\textbackslash{}n");
    1.21 ++	printf("hello, world!\textbackslash{}");
    1.22 + 	return 0;
    1.23 + \}
    1.24 +