Mercurial > hg

view tests/test-simplemerge.py.out @ 25863:1b449b012073 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: diff -r on Solaris emits "Common subdirectories:" When using the -r option to Solaris diff, any directores that compare identically are mentioned in the output. We don't really care about these directories for the purposes of this test, so ignore them.
author Danek Duvall <danek.duvall@oracle.com>
date Mon, 20 Jul 2015 15:42:39 -0700
parents f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK