Mercurial > hgbook

annotate en/examples/tour-merge-conflict.pull.out @ 575:cf6b9bf14af7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected some typos, added a note about the meaning of a sentence
author Javier Rojas <jerojasro@devnull.li>
date Wed, 31 Dec 2008 11:44:58 -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-cousin scam-merge}
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-merge}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 $ \textbf{hg pull -u ../scam-son}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 pulling from ../scam-son
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 searching for changes
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 adding changesets
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 adding manifests
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 adding file changes
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 added 1 changesets with 1 changes to 1 files (+1 heads)
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 not updating, since new heads added
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14 (run 'hg heads' to see heads, 'hg merge' to merge)