Fix twoway_merge that passed d/f conflict marker to merged_entry().
authorJunio C Hamano <junkio@cox.net>
Mon, 2 Apr 2007 23:29:56 +0000 (16:29 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 4 Apr 2007 07:19:29 +0000 (00:19 -0700)
commitb8ba153...bda7bd553f46ea57bdbcee1c90e500a0
tree123d328...7225e8f118c68d1459bed82aaa01f7d5copy hash to clipboard (tree)
parent2960a1d...eef846de9cfd9d6e32d203339d792120copy hash to clipboard (diff)
unpack-trees.c