diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:48:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:48:34 -0700 |
| commit | 5fa38cc3a47c197a352dc52a1b373162c84b8697 (patch) | |
| tree | 9e6fabd7e859f6c1d211cbd5050c1505cb340405 /t/t9601/cvsroot/module/imported-twice.txt,v | |
| parent | Merge branch 'rs/mailinfo-header-cmp' into maint (diff) | |
| parent | mv: allow renaming to fix case on case insensitive filesystems (diff) | |
| download | tgif-5fa38cc3a47c197a352dc52a1b373162c84b8697.tar.xz | |
Merge branch 'dt/merge-recursive-case-insensitive' into maint
On a case insensitive filesystem, merge-recursive incorrectly
deleted the file that is to be renamed to a name that is the same
except for case differences.
* dt/merge-recursive-case-insensitive:
mv: allow renaming to fix case on case insensitive filesystems
merge-recursive.c: fix case-changing merge bug
Diffstat (limited to 't/t9601/cvsroot/module/imported-twice.txt,v')
0 files changed, 0 insertions, 0 deletions