diff tests/test-double-merge @ 7214:0e8a9530d323

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