Mercurial > hg

view tests/test-merge8.out @ 10231:9bf3ebdb19ae stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable together
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 11 Jan 2010 22:41:02 +0100
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