merge-tree: fix typo in merge-tree.c::unresolved
When calculating whether there is a d/f conflict, the calculation of whether both sides are directories generates an incorrect references mask because it does not use the loop index to set the correct bit. Fix this typo. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping committed
Mar 27, 2013 at 15:58 UTC
187c00c6c58ba8916a37011b56cb0cb8f2dd1805
1 file changed
+1
-1
builtin/merge-tree.c
+1
-1
@@ -245,7 +245,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
245
unsigned dirmask = 0, mask = 0;
246
247
for (i = 0; i < 3; i++) {
248
- mask |= (1 << 1);
248
+ mask |= (1 << i);
249
if (n[i].mode && S_ISDIR(n[i].mode))
250
dirmask |= (1 << i);
251
}