comparison tests/test-merge-local.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 0912d8df5e19
children 5af5f0f9d724
comparison
equal deleted inserted replaced
4630:e6d105a51ec7 4631:e3afa670e484