NB: git apply knows --3way, but the patch being applied has to record the hashes of the blobs it applied to when generated (which it will if it was generated by

NB: git apply knows --3way, but the patch being applied has to record the hashes of the blobs it applied to when generated (which it will if it was generated by git). git am also knows --3way transitively.