diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-02 16:29:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-04 00:19:29 -0700 |
| commit | b8ba1535bda7bd553f46ea57bdbcee1c90e500a0 (patch) | |
| tree | 123d328a7225e8f118c68d1459bed82aaa01f7d5 /builtin-push.c | |
| parent | 2960a1d9eef846de9cfd9d6e32d203339d792120 (diff) | |
| download | git-b8ba1535bda7bd553f46ea57bdbcee1c90e500a0.tar.gz | |
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.
Diffstat (limited to 'builtin-push.c')
0 files changed, 0 insertions, 0 deletions