hgbook
annotate ja/examples/tour-merge-conflict.wife.out @ 709:f9f71850ae1a
Merge with foozy
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri Aug 14 12:10:47 2009 -0700 (2009-08-14) |
parents | |
children |
rev | line source |
---|---|
foozy@708 | 1 $ \textbf{cat > letter.txt <<EOF} |
foozy@708 | 2 > \textbf{Greetings!} |
foozy@708 | 3 > \textbf{I am Mariam Abacha, the wife of former} |
foozy@708 | 4 > \textbf{Nigerian dictator Sani Abacha.} |
foozy@708 | 5 > \textbf{EOF} |
foozy@708 | 6 $ \textbf{hg add letter.txt} |
foozy@708 | 7 $ \textbf{hg commit -m '419 scam, first draft'} |