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

hgbook

some friggin' merge or something like that.

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'}