From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:23:13 +0000 (-0700)
Subject: Merge branch 'dt/merge-recursive-case-insensitive'
X-Git-Tag: v2.1.0-rc0~166
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=067fe6435534588bfd63857663532861d711d56e;p=thirdparty%2Fgit.git

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
---

067fe6435534588bfd63857663532861d711d56e