hgbook
diff en/examples/tour-merge-conflict.pull.out @ 144:006bbad1f190
Add expected output files.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue Mar 06 21:44:56 2007 -0800 (2007-03-06) |
parents | |
children | e281bd9a8e47 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/tour-merge-conflict.pull.out Tue Mar 06 21:44:56 2007 -0800 1.3 @@ -0,0 +1,13 @@ 1.4 +$ \textbf{cd ..} 1.5 +$ \textbf{hg clone scam-cousin scam-merge} 1.6 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.7 +$ \textbf{cd scam-merge} 1.8 +$ \textbf{hg pull -u ../scam-son} 1.9 +pulling from ../scam-son 1.10 +searching for changes 1.11 +adding changesets 1.12 +adding manifests 1.13 +adding file changes 1.14 +added 1 changesets with 1 changes to 1 files (+1 heads) 1.15 +not updating, since new heads added 1.16 +(run 'hg heads' to see heads, 'hg merge' to merge)