hgbook
view en/examples/tour-merge-conflict.cousin.out @ 275:96ea24a916f9
Merge with myself.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Nov 26 20:42:36 2007 -0800 (2007-11-26) |
| 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'}