hgbook

view en/examples/tour.diff.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 1b52bda675d0
line source
1 $ \textbf{hg diff}
2 diff -r hello.c
3
4
5 @@ -8,5 +8,6 @@ int main(int argc, char **argv)
6 int main(int argc, char **argv)
7 \{
8 printf("hello, world!\textbackslash{}");
9 + printf("hello again!\textbackslash{}n");
10 return 0;
11 \}