Mercurial > hg

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 59b8f9361545
children 3d1f9dcecdea
line wrap: on
line diff