diff tests/test-clone.out @ 2827:56f99f5aab34

Merge: refactor err and failedmerge -> unresolved
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 09:26:00 -0500
parents b2ae81a7df29
children aaeb7f5d1052
line wrap: on
line diff