checkout -f: deal with a D/F conflict entry correctly
authorJunio C Hamano <gitster@pobox.com>
Sat, 18 Jul 2009 19:26:38 +0000 (12:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Jul 2009 23:57:30 +0000 (16:57 -0700)
commit78d3b06...0f5e6aaea001ee8e3e7c8e401dc4b244
tree39ce767...e891ff709b13d6dbae15739e6118350ecopy hash to clipboard (tree)
parentb45a09c...b4a80ccc6eeb0f390ab8f4eb6f31c922copy hash to clipboard (diff)
unpack-trees.c