diff tests/test-nested-repo.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 74f70f2e08aa
children d316124ebbea
line wrap: on
line diff