diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:17:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:17:22 -0700 |
| commit | ab9bc95d537187fc39465bca1d40438b2e2ee6b5 (patch) | |
| tree | fb3b3f711b672329d2c65aadd1781a264b41ca7a /diff-no-index.c | |
| parent | Merge branch 'pr/use-default-sigpipe-setting' (diff) | |
| parent | merge-recursive: remove stale commented debugging code (diff) | |
| download | tgif-ab9bc95d537187fc39465bca1d40438b2e2ee6b5.tar.xz | |
Merge branch 'sb/merge-recursive-copy-paste-fix'
"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
Diffstat (limited to 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions