hgbook

diff en/examples/tour-merge-conflict.wife.out @ 534:22af452c6c59

find changesets by author, revision, files, or words in the commit message
finished revision of branch.tex. beginning revision of daily.tex
author Javier Rojas <jerojasro@devnull.li>
date Sun Jan 25 20:20:37 2009 -0500 (2009-01-25)
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	Sun Jan 25 20:20:37 2009 -0500
     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'}