diff options
| author | Steffen Prohaska <prohaska@zib.de> | 2008-05-15 07:19:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-17 02:43:26 -0700 |
| commit | 0047dd2fd1fc1980913901c5fa098357482c2842 (patch) | |
| tree | 24511ba1d8a1420678bd92c73e302f67ab732063 /git-merge-resolve.sh | |
| parent | 8a19aaab6394df2c6138d5b8b1411eb00bfcf442 (diff) | |
| download | git-0047dd2fd1fc1980913901c5fa098357482c2842.tar.gz | |
t0050: Fix merge test on case sensitive file systems
On a case sensitive filesystem, "git reset --hard" might refuse to
overwrite a file whose name differs only by case, even if
core.ignorecase is set. It is not clear which circumstances cause this
behavior. This commit simply works around the problem by removing
the case changing file before running "git reset --hard".
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions