hgbook

view ja/examples/tour.merge.merge.out @ 1034:0525fc68b7fe

Update po files with source xml files
author Dongsheng Song <dongsheng.song@gmail.com>
date Wed Nov 04 14:11:14 2009 +0800 (2009-11-04)
parents
children
line source
1 $ \textbf{hg merge}
2 merging hello.c
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
4 (branch merge, don't forget to commit)