Mercurial > hgbook
view en/examples/tour-merge-conflict.cousin.out @ 144:006bbad1f190
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, 06 Mar 2007 21:44:56 -0800 |
parents | |
children | e281bd9a8e47 |
line wrap: on
line source
$ \textbf{cd ..} $ \textbf{hg clone scam scam-cousin} 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ \textbf{cd scam-cousin} $ \textbf{cat > letter.txt <<EOF} > \textbf{Greetings!} > \textbf{I am Shehu Musa Abacha, cousin to the former} > \textbf{Nigerian dictator Sani Abacha.} > \textbf{EOF} $ \textbf{hg commit -m '419 scam, with cousin'}