Merge branch 'sr/log-SG-no-textconv' into maint

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index e0d0b7d28b9e1e67fe6ea6521a683df89f5c9416..bc912e399efa295615e9bfaac0de03904edff367 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -245,7 +245,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
        unsigned dirmask = 0, mask = 0;
 
        for (i = 0; i < 3; i++) {
-               mask |= (1 << 1);
+               mask |= (1 << i);
                if (n[i].mode && S_ISDIR(n[i].mode))
                        dirmask |= (1 << i);
        }