From: Junio C Hamano Date: Wed, 11 Oct 2017 05:52:23 +0000 (+0900) Subject: Merge branch 'jk/refs-df-conflict' X-Git-Tag: v2.15.0-rc1~5 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bab02c6e63958fca62e197053f41affcd50bb00a Merge branch 'jk/refs-df-conflict' An ancient bug that made Git misbehave with creation/renaming of refs has been fixed. * jk/refs-df-conflict: refs_resolve_ref_unsafe: handle d/f conflicts for writes t3308: create a real ref directory/file conflict --- bab02c6e63958fca62e197053f41affcd50bb00a