comparison tests/test-flags.out @ 9750:f153af9580fe

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 a3d73b3e1f8a
children
comparison
equal deleted inserted replaced
9749:1b1b33ae5a24 9750:f153af9580fe