hgbook

view en/examples/branch-named.commit.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
children
line source
1 $ \textbf{echo 'hello again' >> myfile}
2 $ \textbf{hg commit -m 'Second commit'}
3 $ \textbf{hg tip}
4 changeset:
5 branch: foo
6 tag: tip
7 user: Bryan O'Sullivan <bos@serpentine.com>
9 summary: Second commit