Show usage string for 'git log -h', 'git show -h' and 'git diff -h'

diff --git a/unpack-trees.c b/unpack-trees.c
index 48d862d3b478875c3747bdb39a8cba0068300e97..720f7a161651126872b7357173c10d69d1db7636 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -999,7 +999,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)) {