hgbook
diff en/examples/tour-merge-conflict.son.out @ 144:006bbad1f190
Add expected output files.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
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 | e281bd9a8e47 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/tour-merge-conflict.son.out Tue Mar 06 21:44:56 2007 -0800 1.3 @@ -0,0 +1,10 @@ 1.4 +$ \textbf{cd ..} 1.5 +$ \textbf{hg clone scam scam-son} 1.6 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.7 +$ \textbf{cd scam-son} 1.8 +$ \textbf{cat > letter.txt <<EOF} 1.9 +> \textbf{Greetings!} 1.10 +> \textbf{I am Alhaji Abba Abacha, son of the former} 1.11 +> \textbf{Nigerian dictator Sani Abacha.} 1.12 +> \textbf{EOF} 1.13 +$ \textbf{hg commit -m '419 scam, with son'}