diff tests/test-merge10.out @ 7214:0e8a9530d323

run-tests: --interactive overrides -j
author Matt Mackall <mpm@selenic.com>
date Wed, 22 Oct 2008 17:34:37 -0500
parents 368a4ec603cc
children a3d73b3e1f8a
line wrap: on
line diff