hgbook

view en/examples/tour.merge.parents.out @ 336:7e52f0cc4516

find changesets by author, revision, files, or words in the commit message
changed es/hgext.tex
changed es/hook.tex
changed es/kdiff3.png
changed es/license.tex
changed es/mq-collab.tex
changed es/mq-ref.tex
changed es/mq.tex
changed es/note.png
changed es/tour-merge.tex
changed es/undo-manual-merge.dot
changed es/undo-non-tip.dot

files needed to compile the pdf version of the book.
author jerojasro@localhost
date Sat Oct 18 15:44:41 2008 -0500 (2008-10-18)
parents
children
line source
1 $ \textbf{hg parents}
2 changeset:
3 user: Bryan O'Sullivan <bos@serpentine.com>
4
5 summary: A new hello for a new day.
6
7 changeset:
8 tag: tip
9 parent:
10 user: Bryan O'Sullivan <bos@serpentine.com>
11
12 summary: Added an extra line of output
13
14 $ \textbf{cat hello.c}
15 /*
16 * Placed in the public domain by Bryan O'Sullivan. This program is
17 * not covered by patents in the United States or other countries.
18 */
19
20 #include <stdio.h>
21
22 int main(int argc, char **argv)
23 \{
24 printf("once more, hello.\textbackslash{}n");
25 printf("hello, world!\textbackslash{}");
26 printf("hello again!\textbackslash{}n");
27 return 0;
28 \}