diff tests/test-merge-local.out @ 3955:9af4b853ed4d

convert-repo: add CVS branch support
author Matt Mackall <mpm@selenic.com>
date Fri, 22 Dec 2006 17:59:34 -0600
parents ad6f34c83c3d
children 4787e2b0dd03
line wrap: on
line diff