diff tests/test-merge7.out @ 4614:3a645af7fb76

localrepo and dirstate: rename reload to invalidate We want to avoid actually reloading if possible.
author Matt Mackall <mpm@selenic.com>
date Mon, 18 Jun 2007 13:24:34 -0500
parents 93a4e72b4f83
children 17ed9b9a0d03
line wrap: on
line diff