Mercurial > hgbook
view en/examples/tour-merge-conflict.pull.out @ 401: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, 20 Aug 2008 22:00:46 +0200 |
parents | 006bbad1f190 |
children |
line wrap: on
line source
$ \textbf{cd ..} $ \textbf{hg clone scam-cousin scam-merge} updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ \textbf{cd scam-merge} $ \textbf{hg pull -u ../scam-son} pulling from ../scam-son searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) not updating, since new heads added (run 'hg heads' to see heads, 'hg merge' to merge)