hgbook
diff en/examples/tour.diff.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 | 006bbad1f190 |
children |
line diff
1.1 --- a/en/examples/tour.diff.out Tue Mar 06 21:44:56 2007 -0800 1.2 +++ b/en/examples/tour.diff.out Tue Oct 21 22:41:51 2008 -0500 1.3 @@ -2,7 +2,7 @@ 1.4 diff -r hello.c 1.5 1.6 1.7 -@@ -8,5 +8,6 @@ int main(int argc, char **argv) 1.8 +@@ -8,5 +8,6 @@ 1.9 int main(int argc, char **argv) 1.10 \{ 1.11 printf("hello, world!\textbackslash{}");