diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-10 13:52:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-10 13:52:39 -0700 |
| commit | 2d659f7d6e6071701a4f532487edf139b3e1fa9d (patch) | |
| tree | a14ae14078861d0e0134f08781e41acd19e97c30 /merge-recursive.h | |
| parent | d67f9d5e8fd2c165304153a87fd96054d2b74981 (diff) | |
| parent | 4d6be03b95c3db21db1bb8fee01128c1b13f70e7 (diff) | |
| download | git-2d659f7d6e6071701a4f532487edf139b3e1fa9d.tar.gz git-2d659f7d6e6071701a4f532487edf139b3e1fa9d.tar.xz | |
Merge branch 'jk/diffcore-rename-duplicate'
A corrupt input to "git diff -M" can cause us to segfault.
* jk/diffcore-rename-duplicate:
diffcore-rename: avoid processing duplicate destinations
diffcore-rename: split locate_rename_dst into two functions
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions