[PATCH 3 of 3 V2] merge: compare symbolic-link-ness to check identity against the unknown file

[Siddharth Agarwal]

On 05/15/2013 08:44 AM, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> # Date 1368632246 -32400
> #      Thu May 16 00:37:26 2013 +0900
> # Node ID 6e46faccfdec3732e2c34a7e9ab03db481bce4bb
> # Parent  185f02ec640199455dabfb80ebaca407f1249f82
> merge: compare symbolic-link-ness to check identity against the unknown file

This one's great and can seemingly land independently of the other two.