hgbook

view en/examples/rollback.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{hg status}
2 M a
3 $ \textbf{echo b > b}
4 $ \textbf{hg commit -m 'Add file b'}