Mercurial > hg

comparison tests/test-merge-default @ 4416:bb1800a7d7e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 013921c753bd
children 9cd6578750b9
comparison
equal deleted inserted replaced
4415:1a63b44f90c9 4416:bb1800a7d7e1