Mercurial > hgbook

view en/examples/tour-merge-conflict.commit.out @ 648:bc14f94e726a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check in a known-broken example to fix up later - XXX
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 29 Jan 2009 22:47:34 -0800
parents 83790457e85b
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 resolve -m letter.txt}
$ \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