hgbook

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

find changesets by author, revision, files, or words in the commit message
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 diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/tour-merge-conflict.wife.out	Mon Nov 26 12:24:53 2007 -0800
     1.3 @@ -0,0 +1,7 @@
     1.4 +$ \textbf{cat > letter.txt <<EOF}
     1.5 +> \textbf{Greetings!}
     1.6 +> \textbf{I am Mariam Abacha, the wife of former}
     1.7 +> \textbf{Nigerian dictator Sani Abacha.}
     1.8 +> \textbf{EOF}
     1.9 +$ \textbf{hg add letter.txt}
    1.10 +$ \textbf{hg commit -m '419 scam, first draft'}