[PATCH stable] largefiles: handle merges between normal files and largefiles (issue3084)

[timeless]

> I think if we printed something like:
> keep (l)ocal or take (o)ther
> (other is newer)
> It would prevent a huge number of cases where the user must abort and
find out which one is the one he wants.  Most use cases with a binary file,
if you want the one that is newer -- it's a newer version of the library,
or an updated PNG image, or whatever.

You need:
Author, Date, Size, Revision

For both sides. Bonus points for having file paths for both so that the
user can visually compare them in some tool.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20111213/0864adb3/attachment.html>