hgbook
view en/examples/tour-merge-conflict.cousin.out @ 319:1d277d6aa187
Merge
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Aug 26 14:14:24 2008 -0700 (2008-08-26) |
| parents | 006bbad1f190 |
| children |
line source
1 $ \textbf{cd ..}
2 $ \textbf{hg clone scam scam-cousin}
3 updating working directory
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 $ \textbf{cd scam-cousin}
6 $ \textbf{cat > letter.txt <<EOF}
7 > \textbf{Greetings!}
8 > \textbf{I am Shehu Musa Abacha, cousin to the former}
9 > \textbf{Nigerian dictator Sani Abacha.}
10 > \textbf{EOF}
11 $ \textbf{hg commit -m '419 scam, with cousin'}