diff tests/test-walk.out @ 1389:9b3ef6f3cef5

convert-repo: fix up octopus merge conversion
author Matt Mackall <mpm@selenic.com>
date Wed, 05 Oct 2005 19:27:35 -0700
parents 332f225b835c
children df8416346bb7
line wrap: on
line diff