Mercurial > hgbook

annotate en/examples/tour-merge-conflict.son.out @ 515:15bf7d50b586

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Translated a couple of paragraphs
author jerojasro@devnull.li
date Wed, 12 Nov 2008 22:36:35 -0500
parents e281bd9a8e47
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{cd ..}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 $ \textbf{hg clone scam scam-son}
401
e281bd9a8e47 Fix sample output for test 'tour-merge-conflict'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 144
diff changeset
3 updating working directory
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 $ \textbf{cd scam-son}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 $ \textbf{cat > letter.txt <<EOF}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 > \textbf{Greetings!}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 > \textbf{I am Alhaji Abba Abacha, son of the former}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 > \textbf{Nigerian dictator Sani Abacha.}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 > \textbf{EOF}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 $ \textbf{hg commit -m '419 scam, with son'}