unpack-trees: fix "read-tree -u --reset A B" with conflicted index
authorJeff King <peff@peff.net>
Sat, 29 Dec 2012 20:51:54 +0000 (15:51 -0500)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Nov 2013 18:13:27 +0000 (10:13 -0800)
commitb018ff6...857ee7d79e3c4a8772bac08656a2a3c6
treeca5ce5d...1a14eece1b243b73444456995dbcf8eacopy hash to clipboard (tree)
parentc479d14...80743b1cb86d77695607f4c81f7d8797copy hash to clipboard (diff)
unpack-trees.c