diff --cc: a lost line at the beginning of the file is shown incorrectly

diff --git a/unpack-trees.c b/unpack-trees.c
index aaacaf1015ccf1f353151982a3018ad349663d76..a0697d24126b8cc894649da9a25e652bbea9dab7 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -982,7 +982,7 @@ int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
                return error("Cannot do a oneway merge of %d trees",
                             o->merge_size);
 
-       if (!a)
+       if (!a || a == o->df_conflict_entry)
                return deleted_entry(old, old, o);
 
        if (old && same(old, a)) {