view en/examples/tour-merge-conflict.commit.out @ 397:2b8c6aa370d5

Fix sample output for test 'branch-repo'.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 21:54:18 +0200
parents 006bbad1f190
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