unpack-trees: do not check for conflict entries too early
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Sat, 31 Jul 2010 06:14:28 +0000 (13:14 +0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Aug 2010 19:16:01 +0000 (12:16 -0700)
commit711f151...7b56f450e3a17b734e84f71bb57522c6
treef1f49fb...c46b07b6a09e1aed87cc99b83c975269copy hash to clipboard (tree)
parent700e66d...6100fff952ffca439834a6deb1062d11copy hash to clipboard (diff)
unpack-trees.c