traverse_trees_recursive(): propagate merge errors up
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Mar 2008 08:26:23 +0000 (01:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Mar 2008 08:26:23 +0000 (01:26 -0700)
commit542c264...01ac551dca0697d6577ec71ad4c245ab
tree0fe387c...cce0b0b8c6d2c37d25d6cfb715808d03copy hash to clipboard (tree)
parent1caeacc...f2973cecf7919a141adc4759acae94d0copy hash to clipboard (diff)
unpack-trees.c