Mercurial > hg > gitserve

view tests/test-merge8.out @ 3420:52617d992eed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Report branch for hg log and friends
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 18:30:18 -0500
parents efbe24c7d8d9
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)
merging a and b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved