hgbook

diff 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
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/branch-named.merge.out	Mon Dec 17 23:16:59 2007 -0500
     1.3 @@ -0,0 +1,16 @@
     1.4 +$ \textbf{hg branch}
     1.5 +bar
     1.6 +$ \textbf{hg merge}
     1.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     1.8 +(branch merge, don't forget to commit)
     1.9 +$ \textbf{hg commit -m 'Merge'}
    1.10 +$ \textbf{hg tip}
    1.11 +changeset:   
    1.12 +branch:      bar
    1.13 +tag:         tip
    1.14 +parent:      
    1.15 +parent:      
    1.16 +user:        Bryan O'Sullivan <bos@serpentine.com>
    1.17 +
    1.18 +summary:     Merge
    1.19 +