What I usually do is different than copy
:%w %.alt
:vert diffsplit %.alt
And then happiliy rebuild the 'alt' version so that the pseudo-matching bits are aligned.
Note that (presumably) git contains spiffy merge / diff cow-powers, which should be able to detect changes to file attachments of file attachments.
, , git fugitive vim , . : , , , , (, script, !)