view ja/examples/tour-merge-conflict.commit.out @ 776:019040fbf5f5

merged to upstream: phase 1
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Tue, 21 Apr 2009 00:36:40 +0900
parents b0db5adf11c1
children
line wrap: on
line source

$ \textbf{cat > letter.txt <<EOF}
> \textbf{Greetings!}
> \textbf{I am Bryan O'Sullivan, no relation of the former}
> \textbf{Nigerian dictator Sani Abacha.}
> \textbf{EOF}
$ \textbf{hg commit -m 'Send me your money'}
$ \textbf{hg tip}
changeset:   
tag:         tip
parent:      
parent:      
user:        Bryan O'Sullivan <bos@serpentine.com>

summary:     Send me your money