Mercurial > hg

view tests/test-merge4.out @ 3281:f49c90b46897

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update test output
author Matt Mackall <mpm@selenic.com>
date Fri, 06 Oct 2006 17:14:50 -0500
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)