hgbook

diff ja/examples/tour.merge.merge.out @ 1090:3c3a2bd7c14e

find changesets by author, revision, files, or words in the commit message
2.5 2 paras translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Sun Nov 22 21:46:53 2009 -0500 (2009-11-22)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/examples/tour.merge.merge.out	Sun Nov 22 21:46:53 2009 -0500
     1.3 @@ -0,0 +1,4 @@
     1.4 +$ \textbf{hg merge}
     1.5 +merging hello.c
     1.6 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
     1.7 +(branch merge, don't forget to commit)