hgbook: ef34f7bec749 en/examples/tour-merge-conflict.wife.out

hgbook

Fix sample output for 'extdiff' test.

author	Guido Ostkamp <hg@ostkamp.fastmail.fm>
date	Wed Aug 20 22:04:41 2008 +0200 (2008-08-20)
parents
children

line source

1 $ \textbf{cat > letter.txt <<EOF}

2 > \textbf{Greetings!}

3 > \textbf{I am Mariam Abacha, the wife of former}

4 > \textbf{Nigerian dictator Sani Abacha.}

5 > \textbf{EOF}

6 $ \textbf{hg add letter.txt}

7 $ \textbf{hg commit -m '419 scam, first draft'}