projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2960a1d) | patch
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)
commitb8ba1535bda7bd553f46ea57bdbcee1c90e500a0
tree123d328a7225e8f118c68d1459bed82aaa01f7d5tree | snapshot
parent2960a1d9eef846de9cfd9d6e32d203339d792120commit | diff
Fix twoway_merge that passed d/f conflict marker to merged_entry().

When switching from one tree to another, we should not send a
marker that says "this file does not exist in the new tree -- I
am a placeholder to tell you that, and not a real blob" down to
merged_entry() as the result of the merge.
unpack-trees.c diff | blob | history
Git—the stupid content tracker