hgbook

annotate en/examples/tour.log-vp.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
rev   line source
bos@144 1 $ \textbf{hg log -v -p -r 2}
bos@144 2 changeset:
bos@144 3 user: Bryan O'Sullivan <bos@serpentine.com>
bos@144 4
bos@144 5 files: hello.c
bos@144 6 description:
bos@144 7 Introduce a typo into hello.c.
bos@144 8
bos@144 9
bos@144 10 diff -r -r hello.c
bos@144 11
bos@144 12
bos@144 13 @@ -11,6 +11,6 @@
bos@144 14
bos@144 15 int main(int argc, char **argv)
bos@144 16 \{
bos@144 17 - printf("hello, world!\textbackslash{}n");
bos@144 18 + printf("hello, world!\textbackslash{}");
bos@144 19 return 0;
bos@144 20 \}
bos@144 21