t3308: create a real ref directory/file conflict
authorJeff King <peff@peff.net>
Fri, 6 Oct 2017 14:38:30 +0000 (10:38 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sat, 7 Oct 2017 01:31:52 +0000 (10:31 +0900)
commitf2515d9...9e66d4711e50dcc774c47393ba1704ab
treeb9ed772...0e08fef1f7da6fc8a4eaded547c1503ecopy hash to clipboard (tree)
parent217f276...cbcb562872437eed4dec62e00846d90ccopy hash to clipboard (diff)
t/t3308-notes-merge.sh