diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:08 -0700 |
| commit | 3aab60b3baefd79d113fdc83685ba38c71986538 (patch) | |
| tree | 36e8e17ba930e1595fbcb2f6e812f3582a50d5d7 /t/t6038-merge-text-auto.sh | |
| parent | ae8ada450a9103d2fe94ac9baf072fd31de08c30 (diff) | |
| parent | 4d6be03b95c3db21db1bb8fee01128c1b13f70e7 (diff) | |
| download | git-3aab60b3baefd79d113fdc83685ba38c71986538.tar.gz | |
Merge branch 'jk/diffcore-rename-duplicate' into maint
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 't/t6038-merge-text-auto.sh')
0 files changed, 0 insertions, 0 deletions