diff tests/test-push-warn @ 2827:56f99f5aab34

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