diff tests/test-merge5.t @ 14002:a738c30d4b18

run-tests: add a lock for console I/O
author Matt Mackall <mpm@selenic.com>
date Sun, 24 Apr 2011 16:46:37 -0500
parents bc13e17067d9
children 610873cf064a
line wrap: on
line diff