Mercurial > hg

view tests/test-merge4.out @ 3625:cc0cd5942223

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add -R switch Restarts at first .err file if one exists, otherwise runs all tests
author Matt Mackall <mpm@selenic.com>
date Wed, 08 Nov 2006 13:20:08 -0600
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)