Elijah Newren <newren@xxxxxxxxx> writes: > This summary feels misleading; it's not simple rename + content merge, > it's double rename + content merge. Perhaps: > > When a binary file gets modified and renamed on both sides of history > to different locations, both files would be written to the working > tree but both would have the contents from "ours". This has been > corrected so that the path from each side gets their original content. Thanks.
