Mercurial > hgbook
view ja/examples/tour-merge-conflict.son.out @ 783:b15bea650f30
started tour-basic.tex
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Wed, 03 Jun 2009 18:53:39 +0900 |
parents | b0db5adf11c1 |
children |
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'}