diff tests/test-merge4 @ 646:342927da4f4c

Show remote client output with "remote:"
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Jul 2005 22:30:00 -0800
parents 5e9e8b8d2629
children 7e4843b7efd2
line wrap: on
line diff