view tests/test-merge8.out @ 9579:c06e7581bbaa

color: add test for record support
author Brodie Rao <me+hg@dackz.net>
date Fri, 09 Oct 2009 03:53:24 -0400
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line source

updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved