hgbook

annotate en/examples/tour.tip.out @ 156:91a936be78b8

Document merge behaviour with file names.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Mar 12 23:11:26 2007 -0700 (2007-03-12)
parents
children 1b52bda675d0
rev   line source
bos@144 1 $ \textbf{hg tip -vp}
bos@144 2 changeset:
bos@144 3 tag: tip
bos@144 4 user: Bryan O'Sullivan <bos@serpentine.com>
bos@144 5
bos@144 6 files: hello.c
bos@144 7 description:
bos@144 8 Added an extra line of output
bos@144 9
bos@144 10
bos@144 11 diff -r -r hello.c
bos@144 12
bos@144 13
bos@144 14 @@ -8,5 +8,6 @@ int main(int argc, char **argv)
bos@144 15 int main(int argc, char **argv)
bos@144 16 \{
bos@144 17 printf("hello, world!\textbackslash{}");
bos@144 18 + printf("hello again!\textbackslash{}n");
bos@144 19 return 0;
bos@144 20 \}
bos@144 21