hgbook

view en/examples/tour-merge-conflict.son.out @ 254:7301e64c362e

find changesets by author, revision, files, or words in the commit message
Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed May 30 22:18:04 2007 -0700 (2007-05-30)
parents
children e281bd9a8e47
line source
1 $ \textbf{cd ..}
2 $ \textbf{hg clone scam scam-son}
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 $ \textbf{cd scam-son}
5 $ \textbf{cat > letter.txt <<EOF}
6 > \textbf{Greetings!}
7 > \textbf{I am Alhaji Abba Abacha, son of the former}
8 > \textbf{Nigerian dictator Sani Abacha.}
9 > \textbf{EOF}
10 $ \textbf{hg commit -m '419 scam, with son'}