diff tests/test-merge6.out @ 5182:012dbf88b9b2

remove unneeded imports of mdiff
author Matt Mackall <mpm@selenic.com>
date Wed, 15 Aug 2007 16:09:50 -0500
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff