diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:23:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:23:13 -0700 |
| commit | 067fe6435534588bfd63857663532861d711d56e (patch) | |
| tree | a60a6ba1b8fb6b65e380c17b721be6d6bdf03320 /test-scrap-cache-tree.c | |
| parent | Merge branch 'rs/reflog-exists' (diff) | |
| parent | mv: allow renaming to fix case on case insensitive filesystems (diff) | |
| download | tgif-067fe6435534588bfd63857663532861d711d56e.tar.xz | |
Merge branch 'dt/merge-recursive-case-insensitive'
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 'test-scrap-cache-tree.c')
0 files changed, 0 insertions, 0 deletions