| commit | b8ba1535bda7bd553f46ea57bdbcee1c90e500a0 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 2 Apr 2007 23:29:56 +0000 (2 16:29 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 4 Apr 2007 07:19:29 +0000 (4 00:19 -0700) | ||
| tree | 123d328a7225e8f118c68d1459bed82aaa01f7d5 | treesnapshot (tar.gz zip) |
| parent | 2960a1d9eef846de9cfd9d6e32d203339d792120 | commitdiff |
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.
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 | diffblobblamehistory |