diff tests/test-merge7.out @ 1716:ef8cd889a78b

Refactor excessive merge detection, add test
author Matt Mackall <mpm@selenic.com>
date Fri, 17 Feb 2006 17:23:53 -0600
parents bf6c91cb816f
children 6d50d6189269
line wrap: on
line diff