hgbook: 0525fc68b7fe ja/examples/backout.manual.merge.out

hgbook

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 myfile

3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved

4 (branch merge, don't forget to commit)

5 $ \textbf{hg commit -m 'merged backout with previous tip'}

6 $ \textbf{cat myfile}

7 first change

8 third change