diff tests/test-bad-pull @ 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 0902ffece4b4
children 397b62d5dd13
line wrap: on
line diff