hgbook

view en/examples/tour.clone-pull.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 1b52bda675d0
line source
1 $ \textbf{cd ..}
2 $ \textbf{hg clone hello hello-pull}
3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved