Mercurial > hgbook
comparison ja/examples/backout.manual.merge.out @ 290:b0db5adf11c1 ja_root
fork Japanese translation.
| author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
|---|---|
| date | Wed, 06 Feb 2008 17:43:11 +0900 |
| parents | en/examples/backout.manual.merge.out@5fc4a45c069f |
| children |
comparison
equal
deleted
inserted
replaced
| 289:7be02466421b | 290:b0db5adf11c1 |
|---|---|
| 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 |