From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 18:48:34 +0000 (-0700)
Subject: Merge branch 'dt/merge-recursive-case-insensitive' into maint
X-Git-Tag: v2.0.1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fa38cc3a47c197a352dc52a1b373162c84b8697;p=thirdparty%2Fgit.git

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

5fa38cc3a47c197a352dc52a1b373162c84b8697