diff tests/test-merge-tools.out @ 10723:8ea152e94484

check-code: fix check-code complaint
author Matt Mackall <mpm@selenic.com>
date Wed, 17 Mar 2010 15:36:48 -0500
parents 08a0f04b56bd
children c52057614c72
line wrap: on
line diff