hgbook: 6f167e644762 en/examples/tour-merge-conflict.cousin.out

hgbook

Start writing about named branches.

author	Bryan O'Sullivan <bos@serpentine.com>
date	Fri Apr 20 14:02:10 2007 -0700 (2007-04-20)
parents
children	e281bd9a8e47

line source

1 $ \textbf{cd ..}

2 $ \textbf{hg clone scam scam-cousin}

3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

4 $ \textbf{cd scam-cousin}

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

6 > \textbf{Greetings!}

7 > \textbf{I am Shehu Musa Abacha, cousin to the former}

8 > \textbf{Nigerian dictator Sani Abacha.}

9 > \textbf{EOF}

10 $ \textbf{hg commit -m '419 scam, with cousin'}