On Wed, Jun 12, 2013 at 03:27:58PM +0200, Johan Corveleyn wrote: > I'd say, just edit the moved file with the incoming content, embedded > in conflict markers, just like what we do for text conflicts. That, I > think, would be as good as possible.
That's basically what updating the move is doing anyway. I wouldn't want to apply the incoming changes to the moved file without also clearing the conflict marker.
