hgbook

annotate en/examples/branch-named.merge.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 2936cb7eae7a
rev   line source
bos@206 1 $ \textbf{hg branch}
bos@206 2 bar
bos@206 3 $ \textbf{hg merge}
bos@206 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bos@206 5 (branch merge, don't forget to commit)
bos@206 6 $ \textbf{hg commit -m 'Merge'}
bos@206 7 $ \textbf{hg tip}
bos@206 8 changeset:
bos@206 9 branch: bar
bos@206 10 tag: tip
bos@206 11 parent:
bos@206 12 parent:
bos@206 13 user: Bryan O'Sullivan <bos@serpentine.com>
bos@206 14
bos@206 15 summary: Merge
bos@206 16