hgbook: 4aa900e1de2b en/examples/tour-merge-conflict.commit.out

hgbook

Fixed sample output for 'daily.copy' test.

author	Guido Ostkamp <hg@ostkamp.fastmail.fm>
date	Wed Aug 20 21:48:38 2008 +0200 (2008-08-20)
parents
children	e281bd9a8e47

line source

1 $ \textbf{cat > letter.txt <<EOF}

2 > \textbf{Greetings!}

3 > \textbf{I am Bryan O'Sullivan, no relation of the former}

4 > \textbf{Nigerian dictator Sani Abacha.}

5 > \textbf{EOF}

6 $ \textbf{hg commit -m 'Send me your money'}

7 $ \textbf{hg tip}

8 changeset:

9 tag: tip

10 parent:

11 parent:

12 user: Bryan O'Sullivan <bos@serpentine.com>

14 summary: Send me your money