comparison tests/test-up-local-change.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 0e2be889ccd7
children db10b7114de0
comparison
equal deleted inserted replaced
1388:5eb2d3c54165 1389:9b3ef6f3cef5