Mercurial > hgbook
view ja/examples/tour-merge-conflict.wife.out @ 834:896ab6eaf1c6
merged
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Fri, 10 Jul 2009 02:32:17 +0900 |
parents | b0db5adf11c1 |
children |
line wrap: on
line source
$ \textbf{cat > letter.txt <<EOF} > \textbf{Greetings!} > \textbf{I am Mariam Abacha, the wife of former} > \textbf{Nigerian dictator Sani Abacha.} > \textbf{EOF} $ \textbf{hg add letter.txt} $ \textbf{hg commit -m '419 scam, first draft'}