hgbook

diff en/examples/tour.merge.tip.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
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/tour.merge.tip.out	Mon Dec 17 23:16:59 2007 -0500
     1.3 @@ -0,0 +1,9 @@
     1.4 +$ \textbf{hg tip}
     1.5 +changeset:   
     1.6 +tag:         tip
     1.7 +parent:      
     1.8 +parent:      
     1.9 +user:        Bryan O'Sullivan <bos@serpentine.com>
    1.10 +
    1.11 +summary:     Merged changes
    1.12 +