hgbook

annotate en/examples/tour-merge-conflict.pull.out @ 281:a880d07f2d29

find changesets by author, revision, files, or words in the commit message
Fix repository paths of data/index files in filelog diagram.

Data/index files are stored in the repository at .hg/store/data, not .hg/data.
Modify the filelog diagram to reflect this.
author Arun Thomas <arun.thomas@gmail.com>
date Mon Dec 17 23:16:59 2007 -0500 (2007-12-17)
parents
children e281bd9a8e47
rev   line source
bos@144 1 $ \textbf{cd ..}
bos@144 2 $ \textbf{hg clone scam-cousin scam-merge}
bos@144 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bos@144 4 $ \textbf{cd scam-merge}
bos@144 5 $ \textbf{hg pull -u ../scam-son}
bos@144 6 pulling from ../scam-son
bos@144 7 searching for changes
bos@144 8 adding changesets
bos@144 9 adding manifests
bos@144 10 adding file changes
bos@144 11 added 1 changesets with 1 changes to 1 files (+1 heads)
bos@144 12 not updating, since new heads added
bos@144 13 (run 'hg heads' to see heads, 'hg merge' to merge)