hgbook

diff ja/examples/branch-named.merge.out @ 1042:b08a63383d04

find changesets by author, revision, files, or words in the commit message
1.6.1 2 para translated
author zhaopingsun
date Mon Nov 09 21:53:10 2009 -0500 (2009-11-09)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/examples/branch-named.merge.out	Mon Nov 09 21:53:10 2009 -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 +