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

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