Mercurial > hgbook

comparison 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
comparison
equal deleted inserted replaced
389:5981a0f7540a 776:019040fbf5f5
66 66
67 I am Bryan O'Sullivan, no relation of the former 67 I am Bryan O'Sullivan, no relation of the former
68 Nigerian dictator Sani Abacha. 68 Nigerian dictator Sani Abacha.
69 EOF 69 EOF
70 70
71 hg resolve -m letter.txt
71 hg commit -m 'Send me your money' 72 hg commit -m 'Send me your money'
72 hg tip 73 hg tip