diff tests/test-merge7.out @ 4631:e3afa670e484

demandimport: fix issue579 and add a test fix suggested by Brendan
author Matt Mackall <mpm@selenic.com>
date Mon, 18 Jun 2007 19:43:26 -0500
parents 93a4e72b4f83
children 17ed9b9a0d03
line wrap: on
line diff