diff tests/test-incoming-outgoing @ 2827:56f99f5aab34

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