66052863bb
Use git apply --3way for patch-mode isolated merge checks and applies so diff-tree patches that are already present are accepted as no-ops. Added regression coverage for a clean already-applied binary/full-index patch. Fixes #4135