view tests/test-merge4.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
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)