Mercurial > hgbook

diff ja/examples/tour-merge-conflict @ 776:019040fbf5f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged to upstream: phase 1
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Tue, 21 Apr 2009 00:36:40 +0900
parents en/examples/tour-merge-conflict@4e23c220d1b0 en/examples/tour-merge-conflict@b0db5adf11c1
children
line wrap: on
line diff
--- a/ja/examples/tour-merge-conflict	Mon Apr 20 23:50:34 2009 +0900
+++ b/ja/examples/tour-merge-conflict	Tue Apr 21 00:36:40 2009 +0900
@@ -68,5 +68,6 @@
 Nigerian dictator Sani Abacha.
 EOF
 
+hg resolve -m letter.txt
 hg commit -m 'Send me your money'
 hg tip