diff tests/test-conflict @ 5568:de620356064f

backout: disallow across branches (issue655)
author Matt Mackall <mpm@selenic.com>
date Sat, 01 Dec 2007 13:09:27 -0600
parents 93a4e72b4f83
children
line wrap: on
line diff