When doing a merge, only follow direct ancestor links when computing the
set of filename changes. Do not follow merge links as this can result
in non-intuitive changes. Ticket [554f44ee74e3d3b].
(check-in: 1c4d1272 user: drh tags: trunk)