view en/examples/tour-merge-conflict.commit.out @ 144:006bbad1f190

Add expected output files. This makes it possible to spot changes in Mercurial's output and behaviour over time.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 06 Mar 2007 21:44:56 -0800
parents
children e281bd9a8e47
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