Mercurial > hgbook
view en/examples/tour-merge-conflict.son.out @ 340:48ebf2d7dafe
more mq-ref.tex
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Tue, 03 Jun 2008 20:11:46 +0900 |
parents | 006bbad1f190 |
children | e281bd9a8e47 |
line wrap: on
line source
$ \textbf{cd ..} $ \textbf{hg clone scam scam-son} 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ \textbf{cd scam-son} $ \textbf{cat > letter.txt <<EOF} > \textbf{Greetings!} > \textbf{I am Alhaji Abba Abacha, son of the former} > \textbf{Nigerian dictator Sani Abacha.} > \textbf{EOF} $ \textbf{hg commit -m '419 scam, with son'}