hgbook

view en/examples/tour-merge-conflict.wife.out @ 273:00f69e8825c5

Bring book up to date with recent changes.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Nov 26 12:24:53 2007 -0800 (2007-11-26)
parents
children
line source
1 $ \textbf{cat > letter.txt <<EOF}
2 > \textbf{Greetings!}
3 > \textbf{I am Mariam Abacha, the wife of former}
4 > \textbf{Nigerian dictator Sani Abacha.}
5 > \textbf{EOF}
6 $ \textbf{hg add letter.txt}
7 $ \textbf{hg commit -m '419 scam, first draft'}