hgbook

view en/examples/tour.incoming.out @ 302:e281bd9a8e47

Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 22:00:46 2008 +0200 (2008-08-20)
parents 006bbad1f190
children
line source
1 $ \textbf{cd hello-pull}
2 $ \textbf{hg incoming ../my-hello}
3 comparing with ../my-hello
4 searching for changes
5 changeset:
6 tag: tip
7 user: Bryan O'Sullivan <bos@serpentine.com>
9 summary: Added an extra line of output