merge: audit the right destination file when merging with dir rename

--HG--
branch : stable
Added tag 2.9.1 for changeset b96cb15ec9e0

--HG--
branch : stable
Added signature for changeset b96cb15ec9e0

--HG--
branch : stable