git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6bf6366)
merge-tree: fix typo in merge-tree.c::unresolved
authorJohn Keeping <redacted>
Wed, 27 Mar 2013 15:58:50 +0000 (15:58 +0000)
committerJunio C Hamano <redacted>
Wed, 27 Mar 2013 17:00:50 +0000 (10:00 -0700)
commit187c00c6c58ba8916a37011b56cb0cb8f2dd1805
treefc445362575632fc40f89893d1caacdb976f4445tree | snapshot
parent6bf6366cc6ac3de57ddb77e653d246aba333973dcommit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/merge-tree.c diff | blob | history
git clone https://git.99rst.org/PROJECT