• Junio C Hamano's avatar
    Merge branch 'sb/merge-recursive-copy-paste-fix' · ab9bc95d
    Junio C Hamano authored
    "git merge-recursive" had a small bug that could have made it
    mishandle "one side deleted, the other side did not touch it" in a
    rare corner case, where the other side actually did touch to cause
    the blob object names to be different but both blobs before and
    after the change normalize to the same (e.g. correcting mistake to
    check in a blob with CRLF line endings by replacing it with another
    blob that records the same contents with LF line endings).
    
    * sb/merge-recursive-copy-paste-fix:
      merge-recursive: remove stale commented debugging code
      merge-recursive: fix copy-paste mistake
    ab9bc95d
merge-recursive.c 57.7 KB