comparison tests/test-up-local-change.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 dee55c4a4963
children 6d50d6189269
comparison
equal deleted inserted replaced
1715:40346aa66b0f 1716:ef8cd889a78b