refs_resolve_ref_unsafe: handle d/f conflicts for writes
authorJeff King <peff@peff.net>
Fri, 6 Oct 2017 14:42:17 +0000 (10:42 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sat, 7 Oct 2017 01:32:13 +0000 (10:32 +0900)
commita1c1d81...0dbc4a108dd2c05d2f93049d49e61328
tree87ed65e...becc6ac6140e4782e6b9dc2c8b170df5copy hash to clipboard (tree)
parentf2515d9...9e66d4711e50dcc774c47393ba1704abcopy hash to clipboard (diff)
refs.c
t/t1401-symbolic-ref.sh
t/t3200-branch.sh