hgbook
diff en/examples/tour-merge-conflict.cousin.out @ 296:e0b56f008b09
Fix sample output for 'backout' test.
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed Aug 20 21:51:54 2008 +0200 (2008-08-20) |
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.cousin.out Wed Aug 20 21:51:54 2008 +0200 1.3 @@ -0,0 +1,10 @@ 1.4 +$ \textbf{cd ..} 1.5 +$ \textbf{hg clone scam scam-cousin} 1.6 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.7 +$ \textbf{cd scam-cousin} 1.8 +$ \textbf{cat > letter.txt <<EOF} 1.9 +> \textbf{Greetings!} 1.10 +> \textbf{I am Shehu Musa Abacha, cousin to the former} 1.11 +> \textbf{Nigerian dictator Sani Abacha.} 1.12 +> \textbf{EOF} 1.13 +$ \textbf{hg commit -m '419 scam, with cousin'}