Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8.out @ 5443:58496354773f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew Those crew folks are getting lazy about pulling from upstream before committing.
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Oct 2007 00:46:40 -0500
parents bb1800a7d7e1
children
line wrap: on
line source

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