comparison tests/test-merge10.out @ 5568:de620356064f

backout: disallow across branches (issue655)
author Matt Mackall <mpm@selenic.com>
date Sat, 01 Dec 2007 13:09:27 -0600
parents 59b8f9361545
children 3d1f9dcecdea
comparison
equal deleted inserted replaced
5567:56e9f7b2d8fa 5568:de620356064f