Mercurial > hgbook
diff 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 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/examples/backout.manual.merge.out Wed Feb 06 17:43:11 2008 +0900 @@ -0,0 +1,8 @@ +$ \textbf{hg merge} +merging myfile +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +$ \textbf{hg commit -m 'merged backout with previous tip'} +$ \textbf{cat myfile} +first change +third change