diff tests/test-incoming-outgoing.out @ 4416:bb1800a7d7e1

merge: fix spurious merges for copies in linear updates We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.
author Matt Mackall <mpm@selenic.com>
date Tue, 08 May 2007 02:59:13 -0500
parents 9cceb439048b
children b2d9e553cdc8 671158f060cc
line wrap: on
line diff