hgbook

view en/examples/tour-merge-conflict.wife.out @ 253:bdd271cf1ae1

find changesets by author, revision, files, or words in the commit message
Update expected output.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed May 30 22:05:35 2007 -0700 (2007-05-30)
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'}