Mercurial > hg

diff tests/test-merge-remove @ 9750:f153af9580fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: first part of fix for issue1327 When there are no renames involved, we shortcut to the changeset ancestor. This resolves most cases. Note that Mercurial's rename philosophy elsewhere is that a file's name is signficant and rename data is only consulted when a file of the same name is absent.
author Matt Mackall <mpm@selenic.com>
date Sat, 07 Nov 2009 14:07:45 -0600
parents 653ddd1d7cd7
children
line wrap: on
line diff