checkout -m path: fix recreating conflicts
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jan 2010 20:32:02 +0000 (12:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jan 2010 21:49:41 +0000 (13:49 -0800)
commit6d6f9ac...5db0dfae94ef22c9ecbcf7df00f84399
tree9ab2abb...cbbde004913e683c0d1d4644684c4b21copy hash to clipboard (tree)
parent3273ebc...59ee44fa22026d2882d56010742c6797copy hash to clipboard (diff)
builtin-checkout.c
t/t7201-co.sh