Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 2709:e475fe2a6029

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests.py: skip tests that should not run. print message when any test is skipped. count skipped tests.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 27 Jul 2006 15:53:08 -0700
parents b2ae81a7df29
children
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)