Mercurial > hgbook

view en/examples/tour-merge-conflict.cousin.out @ 199:58e3a6c76725

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More branch/merge stuff.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 16 Apr 2007 17:37:27 -0700
parents 006bbad1f190
children e281bd9a8e47
line wrap: on
line source

$ \textbf{cd ..}
$ \textbf{hg clone scam scam-cousin}
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ \textbf{cd scam-cousin}
$ \textbf{cat > letter.txt <<EOF}
> \textbf{Greetings!}
> \textbf{I am Shehu Musa Abacha, cousin to the former}
> \textbf{Nigerian dictator Sani Abacha.}
> \textbf{EOF}
$ \textbf{hg commit -m '419 scam, with cousin'}