view tests/test-merge8.out @ 12309:fe20536c09d4 stable

merge with crew
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Sep 2010 16:05:00 -0500
parents a3d73b3e1f8a
children
line wrap: on
line source

updating to branch default
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