Mercurial > hgbook

comparison en/examples/results/tour-merge-conflict.wife.out @ 662:44d1363234d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move example output files into examples/results
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 21:37:47 -0700
parents en/examples/tour-merge-conflict.wife.out@006bbad1f190
children 0d5935744f87
comparison
equal deleted inserted replaced
661:f916a8c80554 662:44d1363234d2
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'}