view en/examples/daily.copy.merge.out @ 145:4aecfa5c3ab0

Drop all output from bisect. It's not running deterministically right now.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 06 Mar 2007 21:55:07 -0800
parents 006bbad1f190
children 4aa900e1de2b
line wrap: on
line source

$ \textbf{hg pull ../my-copy}
pulling from ../my-copy
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ \textbf{hg merge}
merging file and new-file
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ \textbf{cat new-file}
line
new contents