diff tests/test-archive.out @ 4884:931f901ab811

merge: fix unnecessary rename merges on linear update (issue631) If one side's revision is identical to the ancestor, we skip the rest of the copy detection logic.
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Jul 2007 14:43:38 -0500
parents 0e2d0a78f81a
children 192cd95c2ba8 a49f2a4d5ff7
line wrap: on
line diff