hgbook

diff en/examples/tour-merge-conflict.wife.out @ 144:006bbad1f190

find changesets by author, revision, files, or words in the commit message
Add expected output files.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 06 21:44:56 2007 -0800 (2007-03-06)
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	Tue Mar 06 21:44:56 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'}